* Updated version to 1.0.4

* Backwards compatibility for Java 6: change JList<Object> to JList * Fix: hide Windows OS.AllowSetForegroundWindow call with reflection, so it does not cause problems on non-Windows platforms * Internal: @SuppressWarnings for old API code generated by Axis * Internal: Avoid BufferedReader resource leak warning
MetaCase · Oct 24, 2012 · 6aef6cf · 6aef6cf
1 parent 983d3cf
commit 6aef6cf
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 15 deletions.
diff --git a/com.metacase.graphbrowser/META-INF/MANIFEST.MF b/com.metacase.graphbrowser/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Graph Browser
 Bundle-SymbolicName: com.metacase.graphbrowser;singleton:=true
-Bundle-Version: 1.0.3
+Bundle-Version: 1.0.4
 Bundle-Activator: com.metacase.graphbrowser.Activator
 Bundle-Vendor: MetaCase
 Require-Bundle: org.eclipse.ui,

diff --git a/com.metacase.graphbrowser/src/com/metacase/API/MEAny.java b/com.metacase.graphbrowser/src/com/metacase/API/MEAny.java
@@ -13,6 +13,7 @@
 
 package com.metacase.API;
 
+@SuppressWarnings({"rawtypes", "serial", "unused"})
 public class MEAny  implements java.io.Serializable {
     private java.lang.String meType;
 

diff --git a/com.metacase.graphbrowser/src/com/metacase/API/MENull.java b/com.metacase.graphbrowser/src/com/metacase/API/MENull.java
@@ -12,6 +12,7 @@
 
 package com.metacase.API;
 
+@SuppressWarnings({"rawtypes", "serial", "unused"})
 public class MENull  implements java.io.Serializable {
     public MENull() {
     }

diff --git a/com.metacase.graphbrowser/src/com/metacase/API/MEOop.java b/com.metacase.graphbrowser/src/com/metacase/API/MEOop.java
@@ -12,6 +12,7 @@
 
 package com.metacase.API;
 
+@SuppressWarnings({"rawtypes", "serial", "unused"})
 public class MEOop  implements java.io.Serializable {
     private int areaID;
 

diff --git a/com.metacase.graphbrowser/src/com/metacase/API/METype.java b/com.metacase.graphbrowser/src/com/metacase/API/METype.java
@@ -12,6 +12,7 @@
 
 package com.metacase.API;
 
+@SuppressWarnings({"serial","rawtypes","unused"})
 public class METype  implements java.io.Serializable {
     private java.lang.String name;
 

diff --git a/com.metacase.graphbrowser/src/com/metacase/API/MetaEditAPILocator.java b/com.metacase.graphbrowser/src/com/metacase/API/MetaEditAPILocator.java
@@ -12,6 +12,7 @@
 
 package com.metacase.API;
 
+@SuppressWarnings({"rawtypes", "serial", "unchecked"})
 public class MetaEditAPILocator extends org.apache.axis.client.Service implements MetaEditAPI {
 
     public MetaEditAPILocator() {

diff --git a/com.metacase.graphbrowser/src/com/metacase/API/MetaEditAPISoapBindingStub.java b/com.metacase.graphbrowser/src/com/metacase/API/MetaEditAPISoapBindingStub.java
@@ -12,8 +12,9 @@
 
 package com.metacase.API;
 
-import org.eclipse.swt.internal.win32.OS;
+// import org.eclipse.swt.internal.win32.OS;
 
+@SuppressWarnings({"rawtypes", "unchecked", "unused"})
 public class MetaEditAPISoapBindingStub extends org.apache.axis.client.Stub implements MetaEditAPIPortType {
     private java.util.Vector cachedSerClasses = new java.util.Vector();
     private java.util.Vector cachedSerQNames = new java.util.Vector();
@@ -1935,7 +1936,11 @@ public MetaEditAPISoapBindingStub(javax.xml.rpc.Service service) throws org.apac
     }
 
 	protected org.apache.axis.client.Call createCall() throws java.rmi.RemoteException {
-    	OS.AllowSetForegroundWindow(-1);
+		try {
+			// OS.AllowSetForegroundWindow(-1);
+			Class.forName("org.eclipse.swt.internal.win32.OS").getMethod("AllowSetForegroundWindow", int.class).invoke(null, -1);
+			}
+		catch (Exception e) {}
         try {
             org.apache.axis.client.Call _call = super._createCall();
             if (super.maintainSessionSet) {

diff --git a/com.metacase.graphbrowser/src/com/metacase/graphbrowser/IniHandler.java b/com.metacase.graphbrowser/src/com/metacase/graphbrowser/IniHandler.java
@@ -14,29 +14,34 @@ public class IniHandler {
      */
     public IniHandler(String _iniPath) {
         FileInputStream fis = null;
+        BufferedReader br = null;
         String strLine = null;
         this.iniFilePath = _iniPath;
         File iniFile = new File(this.iniFilePath);
 
         if (iniFile.exists()) {
-            try {
+        	try {
 	            fis = new FileInputStream(iniFile);
-	        	DataInputStream in = new DataInputStream(fis);
-	        	BufferedReader br = new BufferedReader(new InputStreamReader(in));
-	                while ((strLine = br.readLine()) != null) {
-	                    strLine = strLine.trim();
-	                    int equalsIndex = strLine.indexOf("=");
-	                    if (!strLine.isEmpty() && !strLine.startsWith("#") && equalsIndex != -1) {
-	                    	values.put(strLine.substring(0, equalsIndex), strLine.substring(equalsIndex+1));
-	                    }
+	            DataInputStream in = new DataInputStream(fis);
+        	    br = new BufferedReader(new InputStreamReader(in));
+                while ((strLine = br.readLine()) != null) {
+	                strLine = strLine.trim();
+	                int equalsIndex = strLine.indexOf("=");
+	                if (!strLine.isEmpty() && !strLine.startsWith("#") && equalsIndex != -1) {
+	                    values.put(strLine.substring(0, equalsIndex), strLine.substring(equalsIndex+1));
 	                }
+	            }
             } catch (Exception e) {    
             	e.printStackTrace();
             }
             finally {
                 if (fis != null) {
                 	try {
-                		fis.close();
+                		if (br != null) {
+                			br.close();
+                		} else {
+                			fis.close();
+                		}
                 	} catch (IOException e) {
                 		e.printStackTrace();
                 	}

diff --git a/com.metacase.graphbrowser/src/com/metacase/graphbrowser/SelectionDialog.java b/com.metacase.graphbrowser/src/com/metacase/graphbrowser/SelectionDialog.java
@@ -16,7 +16,7 @@ public class SelectionDialog extends JPanel {
 	 * JPanel for selecting MetaEdit+ projects from given database.
 	 */
 	private static final long serialVersionUID = 1L;
-	JList<Object> itemsList;
+	JList itemsList;
 	JLabel topLabel;
 	JButton selectAllButton;
 	JButton OKbutton, cancelButton;
@@ -50,7 +50,7 @@ public SelectionDialog (final JFrame _parent, List<String> items, boolean single
     	} else {
     		labelStr = headerOkString;
     	}
-    	itemsList = new JList<Object>(items.toArray());
+    	itemsList = new JList(items.toArray());
     	if (singleSelection) itemsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
     	itemCount = items.size();