Menu
▾
▴
[Sblim-commit] ecute/Plugin/com/ibm/ecute/rsa/core/internal/dialogs EditQualifiersDialog.java,1.2,1.3
|
From: Benjamin B. <bg...@us...> - 2005-05-23 07:16:42
|
Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31503/Plugin/com/ibm/ecute/rsa/core/internal/dialogs Modified Files: EditQualifiersDialog.java Log Message: Changes of the representation of qualifier flavors. Index: EditQualifiersDialog.java =================================================================== RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/dialogs/EditQualifiersDialog.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- EditQualifiersDialog.java 19 May 2005 09:17:49 -0000 1.2 +++ EditQualifiersDialog.java 23 May 2005 07:16:30 -0000 1.3 @@ -96,7 +96,7 @@ private static final int BUTTON_WIDTH = 90; private static final int BUTTON_HEIGHT = 22; - private static final int NAME_COL_WIDTH = 125; + private static final int NAME_COL_WIDTH = 135; private static final int TYPE_COL_WIDTH = 60; private Color RED = null; @@ -276,19 +276,16 @@ vName.setWidth(NAME_COL_WIDTH); TableColumn vValue = new TableColumn(valueTable,SWT.LEFT); vValue.setText("Value"); - vValue.setWidth(130); + vValue.setWidth(175); TableColumn vType = new TableColumn(valueTable,SWT.LEFT); vType.setText("Type"); vType.setWidth(TYPE_COL_WIDTH); TableColumn vDefinedIn = new TableColumn(valueTable,SWT.LEFT); vDefinedIn.setText("Defined in"); - vDefinedIn.setWidth(125); + vDefinedIn.setWidth(170); TableColumn vFlavor = new TableColumn(valueTable,SWT.LEFT); vFlavor.setText("Flavor"); - vFlavor.setWidth(105); - TableColumn vScope = new TableColumn(valueTable,SWT.LEFT); - vScope.setText("Scope"); - vScope.setWidth(190); + vFlavor.setWidth(195); valueTable.addMouseListener(new MouseAdapter() { public void mouseDoubleClick(MouseEvent e){ @@ -548,14 +545,10 @@ rColumn.setText("R"); rColumn.setWidth(30); rColumn.setAlignment(SWT.CENTER); - TableColumn overrideColumn = new TableColumn(definitionTable,SWT.LEFT); - overrideColumn.setText("Disable Override"); - overrideColumn.setWidth(95); - overrideColumn.setAlignment(SWT.CENTER); - TableColumn restrictedColumn = new TableColumn(definitionTable,SWT.LEFT); - restrictedColumn.setText("Restricted"); - restrictedColumn.setWidth(75); - restrictedColumn.setAlignment(SWT.CENTER); + TableColumn inheritanceColumn = new TableColumn(definitionTable,SWT.LEFT); + inheritanceColumn.setText("Inheritance Behavior"); + inheritanceColumn.setWidth(160); + inheritanceColumn.setAlignment(SWT.LEFT); TableColumn translatableColumn = new TableColumn(definitionTable,SWT.LEFT); translatableColumn.setText("Translatable"); translatableColumn.setWidth(75); @@ -701,6 +694,9 @@ ti.setBackground(WHITE); } + definitionTable.removeAll(); + fillDefinitionTable(); + resetNewQualifiers(); resetEditedQualifiers(); resetDeletedQualifiers(); @@ -1017,7 +1013,7 @@ Property oppositeProp = null; boolean isOwnedEnd = propertyIsOwnedEnd(prop); // get the property of the other association end - if (isOwnedEnd /*&& prop.getOwner() instanceof AssociationClass*/){ + if (isOwnedEnd){ AssociationClass parentClass = (AssociationClass)prop.getOwner(); List ends = parentClass.getOwnedEnds(); if ((Property)ends.get(0) == prop){ @@ -1062,7 +1058,7 @@ allAvailableQualifers.remove(qualifierObject); } //Qualifier: Max, Min - if(isOwnedEnd /*&& prop.getOwner() instanceof AssociationClass*/){ + if(isOwnedEnd){ if(((AssociationClass)prop.getOwner()).getOwnedEnds().contains(prop)){ if(prop.getUpper() != MultiplicityElement.UNLIMITED_UPPER_BOUND){ qualifierName = "Max"; @@ -1218,35 +1214,25 @@ if(definedIn==null) definedIn = ""; - - - - String scope = ""; + String flavor = ""; 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.flavor2String()!= null){ - flavor = qualifier.flavor2String(); - flavor = flavor.replaceAll(" ", ", "); + if(qualifier.rsaFlavor2String()!= null){ + flavor = qualifier.rsaFlavor2String(); } if(qualifier.defaultValue!=null){ defaultValue = qualifier.defaultValue; } } - String as[] = { - name, qualifierValue, type, definedIn, flavor, scope - }; + String as[] = {name, qualifierValue, type, definedIn, flavor}; tableitem.setText(as); - tableitem.setData(new QualifierValueObject(name, qualifierValue, type, definedIn, flavor, scope, - defaultValue, index)); + tableitem.setData(new QualifierValueObject(name, qualifierValue, type, definedIn, flavor, + defaultValue, index)); return i; } @@ -1283,7 +1269,7 @@ { Qualifier qualifier = (Qualifier)iterator1.next(); addQualiferToDefinitionTable(qualifier.name, qualifier); - } + } } private Qualifier definitionObjectToQualifier(QualifierDefinitionObject definitionObject){ @@ -1300,8 +1286,17 @@ qualifier.methodScope = definitionObject.methodScope; qualifier.parameterScope = definitionObject.parameterScope; qualifier.referenceScope = definitionObject.referenceScope; - qualifier.DissableOverrideFlavor = definitionObject.disableOverrideFlavor; - qualifier.RestrictedFlavor = definitionObject.restrictedFlavor; + if(definitionObject.inheritanceBehaviour.equalsIgnoreCase("Restricted")){ + qualifier.DissableOverrideFlavor = false; + qualifier.RestrictedFlavor = true; + } else if(definitionObject.inheritanceBehaviour.equalsIgnoreCase("ToSubclass DisableOverride")){ + qualifier.DissableOverrideFlavor = true; + qualifier.RestrictedFlavor = false; + } else if(definitionObject.inheritanceBehaviour.equalsIgnoreCase("ToSubclass EnableOverride")){ + qualifier.DissableOverrideFlavor = false; + qualifier.RestrictedFlavor = false; + } + qualifier.TranslatableFlavor = definitionObject.translatableFlavor; return qualifier; @@ -1355,8 +1350,7 @@ String methodS = ""; String parameterS = ""; String referenceS = ""; - String disableOverrideF = ""; - String restrictedF = ""; + String inheritanceBehavior; String translatableF = ""; if (qualifier.classScope){ @@ -1387,28 +1381,30 @@ referenceS = "X"; referenceScope = true; } - if (qualifier.DissableOverrideFlavor){ - disableOverrideF = "X"; - disableOverrideFlavor = true; - } if (qualifier.RestrictedFlavor){ - restrictedF = "X"; - restrictedFlavor = true; + inheritanceBehavior = "Restricted"; + } else { + inheritanceBehavior = "ToSubclass"; + if (qualifier.DissableOverrideFlavor){ + inheritanceBehavior += " DisableOverride"; + } else { + inheritanceBehavior += " EnableOverride"; + } } + if (qualifier.TranslatableFlavor){ translatableF = "X"; translatableFlavor = true; } String as[] = {name, type, defaultValue, classS, associationS, indicationS, - propertyS, methodS, parameterS, referenceS, disableOverrideF, - restrictedF, translatableF}; + propertyS, methodS, parameterS, referenceS, inheritanceBehavior, + translatableF}; tableitem.setText(as); tableitem.setData( - new QualifierDefinitionObject(name, type, defaultValue, - classScope, associationScope, indicationScope, - propertyScope, methodScope, parameterScope, referenceScope, - disableOverrideFlavor, restrictedFlavor, translatableFlavor) + new QualifierDefinitionObject(name, type, defaultValue, classScope, + associationScope, indicationScope, propertyScope, methodScope, + parameterScope, referenceScope, inheritanceBehavior, translatableFlavor) ); return i; @@ -1436,7 +1432,6 @@ TableItem tableitem = null; if(!addAction){ tableitem = definitionTable.getItem(index); - //definitionTable.getItem(index).dispose(); definitionTable.remove(index); tableitem = new TableItem(definitionTable, 0, index); @@ -1454,12 +1449,12 @@ boolean methodScope = false; boolean parameterScope = false; boolean referenceScope = false; - boolean disableOverrideFlavor = false; - boolean restrictedFlavor = false; + String inheritanceBehaviour = ""; boolean translatableFlavor = false; type = definitionObject.type; defaultValue = definitionObject.defaultValue; + inheritanceBehaviour = definitionObject.inheritanceBehaviour; String classS = ""; String associationS = ""; @@ -1468,8 +1463,6 @@ String methodS = ""; String parameterS = ""; String referenceS = ""; - String disableOverrideF = ""; - String restrictedF = ""; String translatableF = ""; if (definitionObject.classScope){ @@ -1500,28 +1493,20 @@ referenceS = "X"; referenceScope = true; } - if (definitionObject.disableOverrideFlavor){ - disableOverrideF = "X"; - disableOverrideFlavor = true; - } - if (definitionObject.restrictedFlavor){ - restrictedF = "X"; - restrictedFlavor = true; - } if (definitionObject.translatableFlavor){ translatableF = "X"; translatableFlavor = true; } String as[] = {name, type, defaultValue, classS, associationS, indicationS, - propertyS, methodS, parameterS, referenceS, disableOverrideF, - restrictedF, translatableF}; + propertyS, methodS, parameterS, referenceS, inheritanceBehaviour, + translatableF}; tableitem.setText(as); tableitem.setData( new QualifierDefinitionObject(name, type, defaultValue, classScope, associationScope, indicationScope, propertyScope, methodScope, parameterScope, referenceScope, - disableOverrideFlavor, restrictedFlavor, translatableFlavor) + inheritanceBehaviour, translatableFlavor) ); @@ -1627,7 +1612,7 @@ List roles = association_.getOwnedEnds(); for (int k = 0; k < roles.size(); k++){ String roleName = ((Property)roles.get(k)).getName(); - // Sort + // Sort int i = 0; for(int j = rolesComboBox.getItemCount(); i < j; i++) { @@ -2194,8 +2179,7 @@ private boolean methodScope; private boolean parameterScope; private boolean referenceScope; - private boolean disableOverrideFlavor; - private boolean restrictedFlavor; + private String inheritanceBehaviour; private boolean translatableFlavor; public QualifierDefinitionObject(){ @@ -2210,16 +2194,14 @@ this.methodScope = false; this.parameterScope = false; this.referenceScope = false; - this.disableOverrideFlavor = false; - this.restrictedFlavor = false; + this.inheritanceBehaviour = null; this.translatableFlavor = false; } public QualifierDefinitionObject(String name, String type, String defaultValue, boolean classScope, boolean associationScope, boolean indicationScope, boolean propertyScope, boolean methodScope, boolean parameterScope, - boolean referenceScope, boolean disableOverrideFlavor, - boolean restrictedFlavor, boolean translatableFlavor){ + boolean referenceScope, String inheritanceBehaviour, boolean translatableFlavor){ this.name = name; this.type = type; @@ -2231,8 +2213,7 @@ this.methodScope = methodScope; this.parameterScope = parameterScope; this.referenceScope = referenceScope; - this.disableOverrideFlavor = disableOverrideFlavor; - this.restrictedFlavor = restrictedFlavor; + this.inheritanceBehaviour = inheritanceBehaviour; this.translatableFlavor = translatableFlavor; } @@ -2249,8 +2230,7 @@ this.methodScope == object.methodScope && this.parameterScope == object.parameterScope && this.referenceScope == object.referenceScope && - this.disableOverrideFlavor == object.disableOverrideFlavor && - this.restrictedFlavor == object.restrictedFlavor && + this.inheritanceBehaviour.equalsIgnoreCase(object.inheritanceBehaviour) && this.translatableFlavor == object.translatableFlavor) { return true; @@ -2319,18 +2299,16 @@ private String datatype; private String definedIn; private String flavor; - private String scope; private String defaultValue; private int index; public QualifierValueObject(String name, String value, String datatype, String definedIn, - String flavor, String scope, String defaultValue, int index){ + String flavor, String defaultValue, int index){ this.name = name; this.value = value; this.datatype = datatype; this.definedIn = definedIn; this.flavor = flavor; - this.scope = scope; this.defaultValue = defaultValue; this.index = index; } @@ -2646,14 +2624,13 @@ String as[] = { valueObject.name, valueObject.value, valueObject.datatype, - valueObject.definedIn, valueObject.flavor, valueObject.scope + valueObject.definedIn, valueObject.flavor }; tableitem.setText(as); tableitem.setData(new QualifierValueObject(valueObject.name, valueObject.value, - valueObject.datatype, valueObject.definedIn, valueObject.flavor, valueObject.scope, + valueObject.datatype, valueObject.definedIn, valueObject.flavor, valueObject.defaultValue, -1)); } - //if(lastAction.equalsIgnoreCase("default")){ if(!valueObject.value.equalsIgnoreCase(valueObject.defaultValue)){ Stereotype undoCimStereotype = element.getAppliedStereotype("CIM::Qualifiers"); @@ -2662,17 +2639,16 @@ element.setValue(undoCimStereotype, "QualifierName[" + undoStereotypePropertyIndex + "]", valueObject.name); element.setValue(undoCimStereotype, "QualifierValue[" + undoStereotypePropertyIndex + "]", valueObject.value); } - //} - + } else { // normal case: set default value TableItem tableitem = valueTable.getItem(index); String as[] = { valueObject.name, valueObject.defaultValue, valueObject.datatype, - valueObject.definedIn, valueObject.flavor, valueObject.scope + valueObject.definedIn, valueObject.flavor }; tableitem.setText(as); tableitem.setData(new QualifierValueObject(valueObject.name, valueObject.defaultValue, - valueObject.datatype, valueObject.definedIn, valueObject.flavor, valueObject.scope, + valueObject.datatype, valueObject.definedIn, valueObject.flavor, valueObject.defaultValue, -1)); } @@ -2877,11 +2853,10 @@ String datatype = object.datatype; String definedIn = object.definedIn; String flavor = object.flavor; - String scope = object.scope; - String defaultValue = object.defaultValue; - int index = object.index; + String defaultValue = object.defaultValue; + int index = object.index; - return new QualifierValueObject(name, value, datatype, definedIn, flavor, scope, defaultValue, index); + return new QualifierValueObject(name, value, datatype, definedIn, flavor, defaultValue, index); } private void addNewQualifiers(){ @@ -3233,10 +3208,9 @@ Button parameterButton; Button referenceButton; Group flavorGroup; + Button restrictedButton; Button enableOverrideButton; Button disableOverrideButton; - Button restrictedButton; - Button toSubclassButton; Button translatableButton; QualifierDefinitionDialog(Shell shell, String title, QualifierDefinitionObject definitionObject){ @@ -3309,9 +3283,9 @@ flavorGroup = new Group(mainComposite, SWT.NONE); flavorGroup.setText("Flavor"); flavorGroup.setLayout(new FormLayout()); - + enableOverrideButton = new Button(flavorGroup, SWT.RADIO); - enableOverrideButton.setText("EnableOverride"); + enableOverrideButton.setText("ToSubclass EnableOverride"); enableOverrideButton.setSelection(true); enableOverrideButton.addSelectionListener(new SelectionAdapter() { @@ -3319,57 +3293,25 @@ { enableOverrideButton.setSelection(true); disableOverrideButton.setSelection(false); - - if(definitionObject != null){ - if(definitionObject.restrictedFlavor){ - toSubclassButton.setSelection(false); - restrictedButton.setSelection(true); - } else { - toSubclassButton.setSelection(true); - restrictedButton.setSelection(false); - } - } else { - toSubclassButton.setSelection(true); - restrictedButton.setSelection(false); - } - - toSubclassButton.setEnabled(true); - restrictedButton.setEnabled(true); + restrictedButton.setSelection(false); } }); disableOverrideButton = new Button(flavorGroup, SWT.RADIO); - disableOverrideButton.setText("DisableOverride"); + disableOverrideButton.setText("ToSubclass DisableOverride"); disableOverrideButton.setSelection(false); disableOverrideButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent selectionevent) { - disableOverrideButton.setSelection(true); enableOverrideButton.setSelection(false); - - toSubclassButton.setSelection(true); + disableOverrideButton.setSelection(true); restrictedButton.setSelection(false); - toSubclassButton.setEnabled(false); - restrictedButton.setEnabled(false); } }); - toSubclassButton = new Button(flavorGroup, SWT.RADIO); - toSubclassButton.setText("ToSubclass"); - toSubclassButton.setSelection(true); - toSubclassButton.addSelectionListener(new SelectionAdapter() { - - public void widgetSelected(SelectionEvent selectionevent) - { - toSubclassButton.setSelection(true); - restrictedButton.setSelection(false); - } - - }); - restrictedButton = new Button(flavorGroup, SWT.RADIO); restrictedButton.setText("Restricted"); restrictedButton.setSelection(false); @@ -3377,8 +3319,9 @@ public void widgetSelected(SelectionEvent selectionevent) { + enableOverrideButton.setSelection(false); + disableOverrideButton.setSelection(false); restrictedButton.setSelection(true); - toSubclassButton.setSelection(false); } }); @@ -3469,22 +3412,24 @@ if(definitionObject.referenceScope) referenceButton.setSelection(true); - if(definitionObject.disableOverrideFlavor){ + if(definitionObject.inheritanceBehaviour.equalsIgnoreCase("ToSubclass EnableOverride")){ + enableOverrideButton.setSelection(true); + disableOverrideButton.setSelection(false); + restrictedButton.setSelection(false); + } else if(definitionObject.inheritanceBehaviour.equalsIgnoreCase("ToSubclass DisableOverride")){ + enableOverrideButton.setSelection(false); disableOverrideButton.setSelection(true); + restrictedButton.setSelection(false); + } else if(definitionObject.inheritanceBehaviour.equalsIgnoreCase("Restricted")){ enableOverrideButton.setSelection(false); - } - if(definitionObject.restrictedFlavor){ + disableOverrideButton.setSelection(false); restrictedButton.setSelection(true); - toSubclassButton.setSelection(false); } + + if(definitionObject.translatableFlavor){ translatableButton.setSelection(true); } - - if(definitionObject.disableOverrideFlavor){ - toSubclassButton.setEnabled(false); - restrictedButton.setEnabled(false); - } } private void fillDatatypeCombo(){ @@ -3539,9 +3484,14 @@ definitionObject.methodScope = methodButton.getSelection(); definitionObject.parameterScope = parameterButton.getSelection(); definitionObject.referenceScope = referenceButton.getSelection(); - - definitionObject.disableOverrideFlavor = disableOverrideButton.getSelection(); - definitionObject.restrictedFlavor = restrictedButton.getSelection(); + + if(enableOverrideButton.getSelection()){ + definitionObject.inheritanceBehaviour = "ToSubclass EnableOverride"; + } else if (disableOverrideButton.getSelection()){ + definitionObject.inheritanceBehaviour = "ToSubclass DisableOverride"; + } else if (restrictedButton.getSelection()){ + definitionObject.inheritanceBehaviour = "Restricted"; + } definitionObject.translatableFlavor = translatableButton.getSelection(); newDefinitionObject = definitionObject; @@ -3643,7 +3593,7 @@ formdata.right = new FormAttachment(100,-5); formdata.top = new FormAttachment(scopeGroup,10); flavorGroup.setLayoutData(formdata); - // first column + formdata = new FormData(); formdata.left = new FormAttachment(0,5); formdata.top = new FormAttachment(0,5); @@ -3653,22 +3603,17 @@ formdata.left = new FormAttachment(0,5); formdata.top = new FormAttachment(enableOverrideButton,10); disableOverrideButton.setLayoutData(formdata); - + formdata = new FormData(); formdata.left = new FormAttachment(0,5); formdata.top = new FormAttachment(disableOverrideButton,10); - formdata.bottom = new FormAttachment(100,-5); - translatableButton.setLayoutData(formdata); - // second column - formdata = new FormData(); - formdata.left = new FormAttachment(50,5); - formdata.top = new FormAttachment(0,5); - toSubclassButton.setLayoutData(formdata); + restrictedButton.setLayoutData(formdata); formdata = new FormData(); - formdata.left = new FormAttachment(50,5); - formdata.top = new FormAttachment(toSubclassButton,10); - restrictedButton.setLayoutData(formdata); + formdata.left = new FormAttachment(0,5); + formdata.top = new FormAttachment(restrictedButton,10); + formdata.bottom = new FormAttachment(100,-5); + translatableButton.setLayoutData(formdata); } } } |
