Changeset 30745 in osm for applications/editors/josm

Timestamp:

2014-10-19T04:22:09+02:00 (10 years ago)

Author:

donvip

Message:

[josm_trustosm] update cots

Location:

applications/editors/josm/plugins/trustosm

Files:

• .classpath (modified) (1 diff)
• bcpg-jdk15on-1.50-javadoc.jar (added)
• bcpg-jdk15on-1.50-sources.jar (added)
• bcprov-jdk15on-1.50-javadoc.jar (added)
• bcprov-jdk15on-1.50-sources.jar (added)
• lib/bcpg-jdk15on-1.50.jar (added)
• lib/bcpg-jdk16-145.jar (deleted)
• lib/bcprov-jdk15on-1.50.jar (added)
• lib/bcprov-jdk16-145.jar (deleted)
• lib/jcalendar-1.3.3.jar (deleted)
• lib/jcalendar-1.4.jar (added)
• lib/jgoodies-common-1.2.0.jar (added)
• lib/jgoodies-looks-2.4.1.jar (added)
• lib/looks-2.0.1.jar (deleted)
• lib/stax-utils.jar (deleted)
• lib/swingx-core-1.6.2.jar (deleted)
• lib/swingx-core-1.6.5-1.jar (added)
• src/org/openstreetmap/josm/plugins/trustosm/TrustOSMplugin.java (modified) (4 diffs)

applications/editors/josm/plugins/trustosm/.classpath

@@ -2 +2 @@
 <classpath>
         <classpathentry kind="src" path="src"/>
-        <classpathentry kind="lib" path="lib/bcpg-jdk16-145.jar"/>
-        <classpathentry kind="lib" path="lib/bcprov-jdk16-145.jar"/>
-        <classpathentry kind="lib" path="lib/jcalendar-1.3.3.jar"/>
-        <classpathentry kind="lib" path="lib/looks-2.0.1.jar"/>
-        <classpathentry kind="lib" path="lib/stax-utils.jar"/>
-        <classpathentry kind="lib" path="lib/swingx-core-1.6.2.jar"/>
+        <classpathentry kind="lib" path="lib/bcpg-jdk15on-1.50.jar" sourcepath="bcpg-jdk15on-1.50-sources.jar">
+                <attributes>
+                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-trustosm/bcpg-jdk15on-1.50-javadoc.jar!/"/>
+                </attributes>
+        </classpathentry>
+        <classpathentry kind="lib" path="lib/bcprov-jdk15on-1.50.jar" sourcepath="bcprov-jdk15on-1.50-sources.jar">
+                <attributes>
+                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-trustosm/bcprov-jdk15on-1.50-javadoc.jar!/"/>
+                </attributes>
+        </classpathentry>
+        <classpathentry kind="lib" path="lib/jcalendar-1.4.jar"/>
+        <classpathentry kind="lib" path="lib/jgoodies-common-1.2.0.jar"/>
+        <classpathentry kind="lib" path="lib/jgoodies-looks-2.4.1.jar"/>
+        <classpathentry kind="lib" path="lib/swingx-core-1.6.5-1.jar"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/TrustOSMplugin.java

@@ -9 +9 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -15 +17 @@
 import java.util.jar.JarFile;
 
+import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
@@ -57 +62 @@
         super(info);
         // check if the jarlibs are already extracted or not and extract them if not
-        if (!Main.pref.getBoolean("trustosm.jarLibsExtracted")) {
+        /*if (!Main.pref.getBoolean("trustosm.jarLibsExtracted")) {
             Main.pref.put("trustosm.jarLibsExtracted", extractFiles("trustosm","lib"));
             Main.pref.put("trustosm.jarLibsExtracted", extractFiles("trustosm","resources"));
-        }
+        }*/
+        extractFiles("trustosm","lib");
+        extractFiles("trustosm","resources");
 
         refreshMenu();
@@ -93 +100 @@
             c.init(Cipher.ENCRYPT_MODE, key192);
             c.doFinal(data);
-        } catch (Exception e) {
-            //e.printStackTrace();
-            System.err.println("Warning: It seems that the Unrestricted Policy Files are not available in this JVM. So high level crypto is not allowed. Problems may occure.");
+        } catch (InvalidKeyException e) {
+            Main.warn("It seems that the Unrestricted Policy Files are not available in this JVM. "+
+                      "So high level crypto is not allowed. Problems may occur.");
             //extractFiles("trustosm","jce");
             installUnrestrictedPolicyFiles();
+        } catch (BadPaddingException | IllegalBlockSizeException | NoSuchPaddingException | NoSuchAlgorithmException e) {
+            Main.error(e);
         }
     }