[Sblim-commit] ecute/Plugin/com/ibm/ecute EditQualifiers.java,1.3,1.4 EcuteEclipsePlugin.java,1.6,1.7 EntryPoint.java,1.15,1.16

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

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

Modified Files:
	EditQualifiers.java EcuteEclipsePlugin.java EntryPoint.java 
Log Message:
Version 2.1 alpha 6d
Edit qualifiers dialog with main functionality added to RSA

Index: EntryPoint.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/EntryPoint.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- EntryPoint.java	29 Dec 2004 10:33:38 -0000	1.15
+++ EntryPoint.java	10 May 2005 09:11:53 -0000	1.16
@@ -39,6 +39,7 @@
 import com.ibm.ecute.plugins.Dialogs.SelectProjectDialog;
 import com.ibm.ecute.utils.Constants;
 import com.ibm.ecute.utils.PropertyList;
+import com.ibm.ecute.utils.Utils;
 
 public class EntryPoint {
     //private static final String defaultConfiguration =
@@ -165,6 +166,21 @@
         } catch (Exception e) {
         }
         frame = new DefaultPluginFrame(dialogTittle);
+        
+        if(inputPluginArgumment.equalsIgnoreCase("RoseREI")||outputPluginArgumment.equalsIgnoreCase("RoseREI")){
+        	String error = Utils.isJacobInstalled();
+        	if (error != null) {
+        		System.out.println("ERROR: "+error);
+        		if(error.startsWith("$")){
+        			error = error.substring(1);
+        			frame.displayInformation("Jacob has been installed", error);	
+        		} else {
+        			frame.displayError("Problem accessing Rose", error);
+        		}
+        		System.exit(1);
+        	}
+        }
+        
         int operation = 0;
         boolean returned = true;
         do {

Index: EditQualifiers.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/EditQualifiers.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- EditQualifiers.java	18 Mar 2005 08:02:36 -0000	1.3
+++ EditQualifiers.java	10 May 2005 09:11:53 -0000	1.4
@@ -20,6 +20,7 @@
  */
 package com.ibm.ecute;
 import java.awt.Dimension;
+import java.awt.Frame;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
@@ -35,6 +36,7 @@
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JTabbedPane;
 import javax.swing.UIManager;
@@ -44,6 +46,7 @@
 import com.ibm.ecute.Dialogs.DefinitionsTab;
 import com.ibm.ecute.Dialogs.ValuesTab;
 import com.ibm.ecute.utils.License;
+import com.ibm.ecute.utils.Utils;
 import com.jacob.com.ComThread;
 
 public class EditQualifiers extends JFrame implements ActionListener,
@@ -80,9 +83,37 @@
 		GridBagLayout mainPanelL = new GridBagLayout();
 		GridBagConstraints mainPanelC = new GridBagConstraints();
 		mainPane.setLayout( mainPanelL );
-
-
+		
 		JTabbedPane tabs = new JTabbedPane();
+		
+		String error = Utils.isJacobInstalled();
+		if (error != null) {
+			System.out.println("ERROR: "+error);
+			Frame frame = new Frame();
+			
+			// Center the frame on the screen
+			Dimension screenSize=Toolkit.getDefaultToolkit().getScreenSize();
+			Point thePoint=new Point(screenSize.width/2,screenSize.height/2);
+			thePoint.translate(-getWidth()/2,-getHeight()/2);
+			frame.setLocation(thePoint);
+			frame.show();
+			
+			
+    		if(error.startsWith("$")){
+    			frame.setTitle("New Jacob version installed");
+    			error = error.substring(1);
+    			JOptionPane.showMessageDialog(frame,
+    					  error,"New Jacob version installed",
+    					  JOptionPane.INFORMATION_MESSAGE);
+    				
+    		} else {
+    			frame.setTitle("Jacob not installed");
+    			JOptionPane.showMessageDialog(frame,
+    					error,"Jacob not installed",
+						JOptionPane.ERROR_MESSAGE);
+    		}
+			System.exit(1);
+		}	
 
 		valuesTab = new ValuesTab(this);
 		tabs.addTab("Qualifier Values",valuesTab);
@@ -244,7 +275,7 @@
 		thePoint.translate(-getWidth()/2,-getHeight()/2);
 		setLocation(thePoint);
 
-		show();      
+		show();
 	} 
 
 	public static void main( String args[] ) {

Index: EcuteEclipsePlugin.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/EcuteEclipsePlugin.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- EcuteEclipsePlugin.java	14 Feb 2005 17:38:06 -0000	1.6
+++ EcuteEclipsePlugin.java	10 May 2005 09:11:53 -0000	1.7
@@ -11,6 +11,8 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.uml2.Model;
+import org.eclipse.uml2.OpaqueExpression;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 
@@ -152,13 +154,22 @@
     }
     
     public QualifiersList getQualifiersList() throws Exception{
-        if(qualifiersList == null){
-        qualifiersList = new QualifiersList();
-        qualifiersList.Load(getQualifierListDestination());
-        }
+    	if(qualifiersList == null){
+    		qualifiersList = new QualifiersList();
+    		qualifiersList.Load(getQualifierListDestination());
+    	}
         return qualifiersList;
     }
     
+    public QualifiersList getQualifiersList(Model model, String name) throws Exception{
+    	
+    	qualifiersList = new QualifiersList();
+    	String modelQualifiers = ((OpaqueExpression)model.getOwnedRule(name).getSpecification()).getBody();
+    	qualifiersList.Load("MODEL_CONSTRAINT*" + modelQualifiers);
+    	
+    	return qualifiersList;
+    }
+    
     public static String getPluginId()
     {
         return "com.ibm.ecute";