sblim-commit

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

Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/properties
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5770/Plugin/com/ibm/ecute/rsa/core/internal/properties

Modified Files:
	QualifiersPropertySection.java 
Log Message:
2.1 beta 1a
changes in flavor and scope representation
changes of edit value and remove value behavior -> apply, undo

Index: QualifiersPropertySection.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/properties/QualifiersPropertySection.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- QualifiersPropertySection.java	23 May 2005 07:16:30 -0000	1.14
+++ QualifiersPropertySection.java	25 May 2005 15:45:48 -0000	1.15
@@ -88,8 +88,8 @@
     private TableColumn valueColumn;
     private TableColumn definedInColumn;
     private TableColumn typeColumn;
-    private TableColumn scopeColumn;
-    private TableColumn flavorColumn;
+    private TableColumn inheritanceColumn;
+    private TableColumn translatableColumn;
     private Table qualifiersTable;
     private ArrayList defaultValueQualifiers;   
     
@@ -152,10 +152,10 @@
         typeColumn.setText("Type");
         definedInColumn = new TableColumn(qualifiersTable, 0);
         definedInColumn.setText("Defined in");
-        flavorColumn = new TableColumn(qualifiersTable, 0);
-        flavorColumn.setText("Flavor");
-        //scopeColumn = new TableColumn(qualifiersTable, 0);
-        //scopeColumn.setText("Scope");
+        inheritanceColumn = new TableColumn(qualifiersTable, 0);
+        inheritanceColumn.setText("Inheritance Behavior");
+        translatableColumn = new TableColumn(qualifiersTable, SWT.CENTER);
+        translatableColumn.setText("Translatable");
 
         qualifiersTable.addMouseListener(new MouseAdapter() {
         	public void mouseDoubleClick(MouseEvent e){
@@ -176,7 +176,7 @@
         formdata.height = 800;
         qualifiersTable.setLayoutData(formdata);
 
-        editValueButton.setEnabled(true);
+        //editValueButton.setEnabled(true);
         
     }
 
@@ -189,7 +189,7 @@
     	
     	qualifiersTable.removeAll();
         defaultValueQualifiers.clear();
-        editValueButton.setEnabled(true);
+        //editValueButton.setEnabled(true);
         if(!(getEObject() instanceof NamedElement))
         {
             packColumns();
@@ -749,27 +749,25 @@
             definedIn = "";
         
         //String scope = "";
-        String flavor = "";
+        String inheritance = "";
+        String translatable = "";
         String defaultValue = "null";
         
         if(qualifier != null){
 	        if(qualifier.type2String()!=null)
 	            type = qualifier.type2String();
-//	        if(qualifier.scope2String()!=null){
-//	            scope = qualifier.scope2String();
-//	            scope = scope.replaceAll(" ",", ");
-//	        }
 	        if(qualifier.rsaFlavor2String()!= null){
-	            //flavor = qualifier.flavor2String();
-	            //flavor = flavor.replaceAll(" ", ", ");
-	        	flavor = qualifier.rsaFlavor2String();
+	        	inheritance = qualifier.rsaFlavor2String();
 	        }
 	        if(qualifier.defaultValue!=null){
 	            defaultValue = qualifier.defaultValue;
 	        }
+	        if(qualifier.TranslatableFlavor){
+	        	translatable = "X";
+	        }
         }
         
-        String as[] = {name, qualifierValue, type, definedIn, flavor/*, scope*/};
+        String as[] = {name, qualifierValue, type, definedIn, inheritance, translatable};
         tableitem.setText(as);
         tableitem.setData(new QualifierValueObject(name, qualifierValue, defaultValue, index));
 
@@ -824,30 +822,16 @@
         return list;
     }
 
-//    protected void displayError(String s, String s1)
-//    {
-//        Status status = new Status(4, ModelerUIPropertiesPlugin.getPluginId(), 6, s1, null);
-//        ErrorDialog.openError(Display.getCurrent().getActiveShell(), s, null, status);
-//    }
-
     private void packColumns()
     {
         nameColumn.pack();
         valueColumn.setWidth(150);
-        //valueColumn.pack();
         typeColumn.pack();
         definedInColumn.pack();
-        flavorColumn.pack();
-        //scopeColumn.pack();
-        //qualifiersTable.pack();
+        inheritanceColumn.pack();
+        translatableColumn.pack();
     }
 
-//    public void addFilter()
-//    {
-//        com.ibm.xtools.emf.msl.internal.MFilter.Or or = new com.ibm.xtools.emf.msl.internal.MFilter.Or(EventListener.elementCreatedEventFilter, EventListener.elementDeletedEventFilter);
-//        getEventListener().setFilter(new com.ibm.xtools.emf.msl.internal.MFilter.Or(or, EventListener.elementModifiedEventFilter));
-//    }
-
     public void handleElementCreatedEvent(Notification notification, EObject eobject, EObject eobject1)
     {
         update(notification, eobject);
@@ -1250,9 +1234,4 @@
         }
     }
     
-    
-//    public void dispose() {
-//        super.dispose();
-//        boldFont.dispose();
-//    }
 }