[Sblim-commit] ecute/Plugin/com/ibm/ecute/Qualifiers Qualifier.java,1.3,1.4 QualifiersList.java,1.7,1.8

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

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

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

Index: Qualifier.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/Qualifiers/Qualifier.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Qualifier.java	26 Nov 2004 13:03:06 -0000	1.3
+++ Qualifier.java	10 May 2005 09:11:54 -0000	1.4
@@ -67,21 +67,29 @@
 			case STRING:
 				return "String";
 			case UNINT8:
-				return "Unsigned Integer8";
+				return "uint8";
+				//return "Unsigned Integer8";
 			case SINT8:
-				return "Integer8";
+				return "sint8";
+				//return "Integer8";
 			case UNINT16:
-				return "Unsigned Integer16";
+				return "uint16";
+				//return "Unsigned Integer16";
 			case SINT16:
-				return "Integer16";
+				return "sint16";
+				//return "Integer16";
 			case UNINT32:
-				return "Unsigned Integer32";
+				return "uint32";
+				//return "Unsigned Integer32";
 			case SINT32:
-				return "Integer32";
+				return "sint32";
+				//return "Integer32";
 			case UNINT64:
-				return "Unsigned Integer64";
+				return "uint64";
+				//return "Unsigned Integer64";
 			case SINT64:
-				return "Integer64";				
+				return "sint64";
+				//return "Integer64";				
 		}
 		return "Unknown";
 	}

Index: QualifiersList.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/Qualifiers/QualifiersList.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- QualifiersList.java	14 Feb 2005 17:38:07 -0000	1.7
+++ QualifiersList.java	10 May 2005 09:11:54 -0000	1.8
@@ -19,6 +19,11 @@
 
 package com.ibm.ecute.Qualifiers;
 
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Point;
+import java.awt.Toolkit;
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -28,6 +33,8 @@
 import java.util.Properties;
 import java.util.Vector;
 
+import javax.swing.JOptionPane;
+
 import com.ibm.ecute.EcuteEclipsePlugin;
 import com.ibm.ecute.EntryPoint;
 import com.ibm.ecute.utils.License;
@@ -45,24 +52,65 @@
     public int size = 0;
 
     public void Load(String fileName) {
-        qualifiersList = new Properties();
-        if (EntryPoint.isRunningFromEclipse()){
-    			try{
-    			    String qualifListDest = EcuteEclipsePlugin.getDefault().getQualifierListDestination();
-    				file=new File(qualifListDest);
-    				FileInputStream flujo=new FileInputStream(file);
-    				qualifiersList.load(flujo);
-    			}catch (Exception e){
-    			    //TODO write ErrorMessage to LogDialog!
-    			}
-    		    
+    	qualifiersList = new Properties();
+    	// RSA import
+    	if (EntryPoint.isRunningFromEclipse()){
+    		
+    		// if import was performed in RSA
+    		try{
+    			if(fileName.startsWith("MODEL_CONSTRAINT*")){
+            		// load from model constraint
+            		int index = fileName.indexOf("*");
+            		String qualifierList = fileName.substring(index+1);
+            		ByteArrayInputStream inputStream = new ByteArrayInputStream(qualifierList.getBytes());
+            		qualifiersList.load(inputStream);
+            	} else {
+            		// load from QualifierList.txt
+            		String qualifListDest = EcuteEclipsePlugin.getDefault().getQualifierListDestination();
+            		file=new File(qualifListDest);
+            		FileInputStream flujo=new FileInputStream(file);
+            		qualifiersList.load(flujo);
+            	}
+    		}catch (Exception e){
+    			//TODO write ErrorMessage to LogDialog!
+    		}
+    		
+    	// Rose	and RSA (if import was not performed)
         } else {
             try {
-                file = new File(fileName);
-                FileInputStream flujo = new FileInputStream(file);
-                qualifiersList.load(flujo);
+            	if(fileName.startsWith("MODEL_CONSTRAINT*")){
+            		// load from model constraint
+            		int index = fileName.indexOf("*");
+            		String qualifierList = fileName.substring(index+1);
+            		ByteArrayInputStream inputStream = new ByteArrayInputStream(qualifierList.getBytes());
+            		qualifiersList.load(inputStream);
+            	} else {
+            		// load from txt file
+            		file = new File(fileName);
+            		FileInputStream flujo = new FileInputStream(file);
+            		qualifiersList.load(flujo);
+            	}
             } catch (Exception e) {
                 e.printStackTrace();
+    			Frame frame = new Frame();
+    			frame.setTitle("No Qualifier Definitions");
+    			// Center the frame on the screen
+    			Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+    			Point thePoint = new Point(screenSize.width/2,screenSize.height/2);
+    			thePoint.translate(-frame.getWidth()/2,-frame.getHeight()/2);
+    			frame.setLocation(thePoint);
+    			frame.show();
+    			
+    			JOptionPane.showMessageDialog(frame,
+    			  "Your qualifier definitions file QualifierList.txt\n" +
+    			  "does not exist.\n\n" +
+    			  "Please copy this file from an other location to the\n "+
+    			  "eCUTE directory or reinstall eCUTE. \n",
+    			  "QualifierList.txt does not exist",
+    			  JOptionPane.ERROR_MESSAGE);
+    			
+    			frame.dispose();
+    			System.exit(1);
             }
         }
 
@@ -92,7 +140,12 @@
 
         definitions.put(qualifier.name.toLowerCase(), qualifier);
 
-        String definition = Qualifier.TYPES[qualifier.type];
+        String definition = "";
+        if(qualifier.type == -1){
+        	definition += "Unknown";
+        } else {
+        	definition += Qualifier.TYPES[qualifier.type];
+        }
         if (qualifier.isArray)
             definition += " []";
         if (qualifier.defaultValue == null)