[Sblim-commit] ecute/Plugin/com/ibm/ecute EditQualifiers.java,1.2,1.3 Check.java,1.2,1.3

[Benjamin B. <bg...@us...>]

Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8426/Plugin/com/ibm/ecute

Modified Files:
	EditQualifiers.java Check.java 
Log Message:


Index: Check.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/Check.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Check.java	8 Jul 2004 16:44:19 -0000	1.2
+++ Check.java	18 Mar 2005 08:02:36 -0000	1.3
@@ -26,6 +26,9 @@
 import java.util.ArrayList;
 import java.util.Hashtable;
 
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+
 import com.ibm.ecute.Dialogs.CheckDialog;
 import com.ibm.ecute.plugins.ProgressFrame;
 import com.ibm.ecute.plugins.Dialogs.DefaultProgressFrame;
@@ -78,8 +81,22 @@
 		
 		//Add latest operations to the runtime machine
 		String threadName = Thread.currentThread().getName();
-		Runtime.getRuntime().addShutdownHook(new theCheck(threadName));
-
+		try {
+			Runtime.getRuntime().addShutdownHook(new theCheck(threadName));
+		} catch (Error e){
+			System.out.println("unsupported JACOB version");
+			JFrame f = new JFrame();
+			JOptionPane.showMessageDialog(f,
+				    "You are using an unsupported version of JACOB.\n" +
+				    "Please install one of the supported JACOB versions listed below.\n\n" +
+				    "Supported versions:\n" +
+				    "- JACOB 1.8\n" +
+				    "- JACOB 1.7",
+				    "ECUTE error",
+				    JOptionPane.ERROR_MESSAGE);
+			System.exit(1);
+		}
+		
 		if (CheckDialog.showDialog()) {
 			selectedOnly = CheckDialog.selectedOnly;
 			duplicatedClasses = CheckDialog.duplicatedClasses;
@@ -96,7 +113,7 @@
 			} catch (Exception e) {
 				theDialog.addLine2Log("" + e);
 				e.printStackTrace();
-			}
+			} 
 			theDialog.endTasks(true);
 
 		} else

Index: EditQualifiers.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/EditQualifiers.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- EditQualifiers.java	13 Aug 2004 07:29:29 -0000	1.2
+++ EditQualifiers.java	18 Mar 2005 08:02:36 -0000	1.3
@@ -260,7 +260,9 @@
 	}
 
     
-	public void windowDeactivated(WindowEvent e){}
+	public void windowDeactivated(WindowEvent e){
+		valuesTab.skipNextEvent = true;
+	}
 	public void windowDeiconified(WindowEvent e){
 		windowActivated(e);
 	}
@@ -269,7 +271,7 @@
 	public void windowClosed(WindowEvent e){}
 	
 	public void windowClosing(WindowEvent e) {
-		boolean result=valuesTab.aceptAction(true);
+		boolean result=valuesTab.acceptAction(true);
 		ComThread.Release();
 			
 		if (result)
@@ -284,7 +286,7 @@
 	public void actionPerformed( ActionEvent e ) {
 		if ( e.getSource() == cancelButton ) {
 			
-			boolean result=valuesTab.aceptAction(true);
+			boolean result=valuesTab.acceptAction(true);
 			ComThread.Release();
 			
 			if (result)
@@ -292,17 +294,17 @@
 		}
 		
 		if ( e.getSource() == OKButton ) {
-			valuesTab.aceptAction(false);
+			valuesTab.acceptAction(false);
 			ComThread.Release();
-			definitionsTab.aceptAction();
+			definitionsTab.acceptAction();
             
 			lock.interrupt();         
 		}
 		
 		if ( e.getSource() == applyButton ) {
-			valuesTab.aceptAction(false);
+			valuesTab.acceptAction(false);
 			ComThread.Release();
-			definitionsTab.aceptAction();
+			definitionsTab.acceptAction();
 		}
 		
 		if ( e.getSource() == undoButton ) {