cherry-picking: #459 removing javaws dependency

andreasprlic · josemduarte · commit 5150f8c6fc57 · 2016-05-02T17:18:25.000-07:00
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
@@ -16,32 +16,12 @@
             <distribution>repo</distribution>
         </license>
     </licenses>
-    <repositories>
-        <!-- Used for javaws:javaws -->
-        <repository>
-            <id>biojava-maven-repo</id>
-            <name>BioJava repository</name>
-            <url>http://www.biojava.org/download/maven/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </releases>
-        </repository>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>javaws</groupId>
-            <artifactId>javaws</artifactId>
-            <version>1.0</version>
-        </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
@@ -94,7 +74,7 @@
     <build>
         <plugins>
 
-			<!-- Excluding demo package is required for avoiding namespace clashes (demo package is in all modules) for signing the jar. See issue #387 -->
+	<!-- Excluding demo package is required for avoiding namespace clashes (demo package is in all modules) for signing the jar. See issue #387 -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -108,4 +88,5 @@
         </plugins>
     </build>
 
+
 </project>
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/ChooseDirAction.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/ChooseDirAction.java
@@ -62,14 +62,7 @@ public void actionPerformed(ActionEvent evt) {
 		if ( txt != null){
 			chooser.setCurrentDirectory(new java.io.File(txt));
 			config.setPdbFilePath(txt);
-			try {
-				PersistentConfig webstartConfig = new PersistentConfig();
 
-				webstartConfig.save(config);
-
-			} catch (Exception e){
-				e.printStackTrace();
-			}
 		}
 		chooser.setDialogTitle("Choose directory that contains your PDB files");
 		chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/webstart/PersistentConfig.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/webstart/PersistentConfig.java
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/webstart/WebStartMain.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/webstart/WebStartMain.java
@@ -229,29 +229,10 @@ private static JProgressBar showProgressBar(JFrame frame, String title, String d
 
 	public static UserConfiguration getWebStartConfig(){
 
-		if ( userConfig == null) {
-			try {
-				PersistentConfig webstartConfig = new PersistentConfig();
-
-				userConfig = webstartConfig.load();
-
-			} catch (Exception e){
-				System.err.println(e.getMessage());
-			}
-		}
-
 		// check if we could load it (i.e. we are running in web start mode)
 		if ( userConfig == null ) {
 			userConfig = WebStartMain.getDefaultConfig();
 
-			try {
-				PersistentConfig webstartConfig = new PersistentConfig();
-
-				webstartConfig.save(userConfig);
-
-			} catch (UnavailableServiceException e){
-				System.err.println(e.getMessage());
-			}
 		}
 
 		return userConfig;
@@ -270,18 +251,6 @@ public static UserConfiguration getDefaultConfig(){
 		return userConfig;
 	}
 
-	public static void persistConfig(UserConfiguration config){
-
-		try {
-			PersistentConfig webstartConfig = new PersistentConfig();
-
-			webstartConfig.save(config);
-
-		} catch (UnavailableServiceException e){
-			e.printStackTrace();
-		}
-
-	}
 
 	public static UserConfiguration requestUserConfig(){
 
