Author: tfmorris
Date: 2007-05-30 12:06:18-0700
New Revision: 12731
Modified:
trunk/src_new/org/argouml/language/java/generator/GeneratorJava.java
trunk/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java
trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java
trunk/src_new/org/argouml/pattern/cognitive/critics/CrConsiderSingleton.java
trunk/src_new/org/argouml/pattern/cognitive/critics/CrSingletonViolatedMissingStaticAttr.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrConstructorNeeded.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrNoOperations.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrUtilityViolated.java
trunk/src_new/org/argouml/uml/reveng/java/Modeller.java
trunk/src_new/org/argouml/uml/ui/foundation/core/ActionSetChangeability.java
trunk/src_new/org/argouml/uml/ui/foundation/core/ActionSetFeatureOwnerScope.java
Log:
Change use of deprecated UML 1.x-only methods related to Scope, Changeability
Modified: trunk/src_new/org/argouml/language/java/generator/GeneratorJava.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/language/java/generator/GeneratorJava.java?view=diff&rev=12731&p1=trunk/src_new/org/argouml/language/java/generator/GeneratorJava.java&p2=trunk/src_new/org/argouml/language/java/generator/GeneratorJava.java&r1=12730&r2=12731
==============================================================================
--- trunk/src_new/org/argouml/language/java/generator/GeneratorJava.java (original)
+++ trunk/src_new/org/argouml/language/java/generator/GeneratorJava.java 2007-05-30 12:06:18-0700
@@ -1600,7 +1600,7 @@
}
private String generateScope(Object f) {
- if (Model.getFacade().isClassifierScope(f)) {
+ if (Model.getFacade().isStatic(f)) {
return "static ";
}
return "";
@@ -1627,7 +1627,7 @@
}
private String generateChangability(Object sf) {
- if (!Model.getFacade().isChangeable(sf)) {
+ if (Model.getFacade().isReadOnly(sf)) {
return "final ";
}
return "";
Modified: trunk/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java?view=diff&rev=12731&p1=trunk/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java&p2=trunk/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java&r1=12730&r2=12731
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java (original)
+++ trunk/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java 2007-05-30 12:06:18-0700
@@ -102,7 +102,7 @@
}
static String generateScope(Object f) {
- if (Model.getFacade().isClassifierScope(f)) {
+ if (Model.getFacade().isStatic(f)) {
return "static ";
}
return "";
@@ -113,7 +113,7 @@
*/
static String generateChangeability(Object obj) {
if (Model.getFacade().isAAttribute(obj)) {
- if (!Model.getFacade().isChangeable(obj)) {
+ if (!Model.getFacade().isReadOnly(obj)) {
return "final ";
}
} else {
Modified: trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java?view=diff&rev=12731&p1=trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java&r1=12730&r2=12731
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java 2007-05-30 12:06:18-0700
@@ -156,9 +156,9 @@
if (newAttribute != null) {
try {
parseAttribute(s, newAttribute);
- Model.getCoreHelper().setOwnerScope(
+ Model.getCoreHelper().setStatic(
newAttribute,
- Model.getFacade().getOwnerScope(attribute));
+ Model.getFacade().isStatic(attribute));
if (i != -1) {
Model.getCoreHelper().addFeature(
classifier, ++i, newAttribute);
Modified: trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java?view=diff&rev=12731&p1=trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java&r1=12730&r2=12731
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java 2007-05-30 12:06:18-0700
@@ -113,23 +113,23 @@
public void found(Object element, String value) {
if (Model.getFacade().isAStructuralFeature(element)) {
if ("false".equalsIgnoreCase(value)) {
- Model.getCoreHelper().setChangeability(element,
- Model.getChangeableKind().getChangeable());
+ Model.getCoreHelper().setReadOnly(element, true);
} else {
- Model.getCoreHelper().setChangeability(element,
- Model.getChangeableKind().getFrozen());
+ Model.getCoreHelper().setReadOnly(element, false);
}
}
}
});
+
+ // TODO: AddOnly has been removed in UML 2.x, so we should phase out
+ // support of it - tfm - 20070529
attributeSpecialStrings[assPos++] =
new PropertySpecialString("addonly",
new PropertyOperation() {
public void found(Object element, String value) {
if (Model.getFacade().isAStructuralFeature(element)) {
if ("false".equalsIgnoreCase(value)) {
- Model.getCoreHelper().setChangeability(element,
- Model.getChangeableKind().getChangeable());
+ Model.getCoreHelper().setReadOnly(element, true);
} else {
Model.getCoreHelper().setChangeability(element,
Model.getChangeableKind().getAddOnly());
Modified: trunk/src_new/org/argouml/pattern/cognitive/critics/CrConsiderSingleton.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/pattern/cognitive/critics/CrConsiderSingleton.java?view=diff&rev=12731&p1=trunk/src_new/org/argouml/pattern/cognitive/critics/CrConsiderSingleton.java&p2=trunk/src_new/org/argouml/pattern/cognitive/critics/CrConsiderSingleton.java&r1=12730&r2=12731
==============================================================================
--- trunk/src_new/org/argouml/pattern/cognitive/critics/CrConsiderSingleton.java (original)
+++ trunk/src_new/org/argouml/pattern/cognitive/critics/CrConsiderSingleton.java 2007-05-30 12:06:18-0700
@@ -85,7 +85,7 @@
* @return {@link #PROBLEM_FOUND PROBLEM_FOUND} if the critic is
* triggered, otherwise {@link #NO_PROBLEM NO_PROBLEM}.
*/
-
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
// Only look at classes...
@@ -110,7 +110,7 @@
return NO_PROBLEM;
}
- // abstract classes are hardly ever singletons
+ // abstract classes are hardly ever singletons
if (Model.getFacade().isAbstract(dm)) {
return NO_PROBLEM;
}
@@ -126,11 +126,11 @@
return NO_PROBLEM;
}
- // If there is an attribute with instance scope => no problem
+ // If there is an attribute which is not static => no problem
Iterator iter = Model.getFacade().getAttributes(dm).iterator();
while (iter.hasNext()) {
- if (Model.getFacade().isInstanceScope(iter.next())) {
+ if (!Model.getFacade().isStatic(iter.next())) {
return NO_PROBLEM;
}
}
@@ -159,5 +159,5 @@
* The UID.
*/
private static final long serialVersionUID = -178026888698499288L;
-} /* end class CrConsiderSingleton */
+}
Modified: trunk/src_new/org/argouml/pattern/cognitive/critics/CrSingletonViolatedMissingStaticAttr.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/pattern/cognitive/critics/CrSingletonViolatedMissingStaticAttr.java?view=diff&rev=12731&p1=trunk/src_new/org/argouml/pattern/cognitive/critics/CrSingletonViolatedMissingStaticAttr.java&p2=trunk/src_new/org/argouml/pattern/cognitive/critics/CrSingletonViolatedMissingStaticAttr.java&r1=12730&r2=12731
==============================================================================
--- trunk/src_new/org/argouml/pattern/cognitive/critics/CrSingletonViolatedMissingStaticAttr.java (original)
+++ trunk/src_new/org/argouml/pattern/cognitive/critics/CrSingletonViolatedMissingStaticAttr.java 2007-05-30 12:06:18-0700
@@ -115,7 +115,7 @@
while (attrs.hasNext()) {
Object attr = attrs.next();
- if (!(Model.getFacade().isClassifierScope(attr))) {
+ if (!(Model.getFacade().isStatic(attr))) {
continue;
}
@@ -128,5 +128,5 @@
return PROBLEM_FOUND;
}
-} /* end class CrSingletonViolatedMissingStaticAttr */
+}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrConstructorNeeded.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrConstructorNeeded.java?view=diff&rev=12731&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrConstructorNeeded.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrConstructorNeeded.java&r1=12730&r2=12731
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrConstructorNeeded.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrConstructorNeeded.java 2007-05-30 12:06:18-0700
@@ -84,7 +84,7 @@
* @return {@link #PROBLEM_FOUND PROBLEM_FOUND} if the critic is
* triggered, otherwise {@link #NO_PROBLEM NO_PROBLEM}.
*/
-
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
// Only look at classes
@@ -125,13 +125,13 @@
while (attrs.hasNext()) {
Object attr = attrs.next();
- if (!Model.getFacade().isInstanceScope(attr))
+ if (Model.getFacade().isStatic(attr))
continue;
if (Model.getFacade().isInitialized(attr))
continue;
- // We have found one with instance scope that is not initialized.
+ // We have found a non-static one that is not initialized.
return PROBLEM_FOUND;
}
@@ -144,6 +144,7 @@
* @see org.argouml.cognitive.critics.Critic#initWizard(
* org.argouml.cognitive.ui.Wizard)
*/
+ @Override
public void initWizard(Wizard w) {
if (w instanceof WizAddConstructor) {
ToDoItem item = (ToDoItem) w.getToDoItem();
@@ -163,7 +164,8 @@
/*
* @see org.argouml.cognitive.critics.Critic#getWizardClass(org.argouml.cognitive.ToDoItem)
*/
+ @Override
public Class getWizardClass(ToDoItem item) {
return WizAddConstructor.class;
}
-} /* end class CrConstructorNeeded */
+}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java?view=diff&rev=12731&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java&r1=12730&r2=12731
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java 2007-05-30 12:06:18-0700
@@ -59,28 +59,38 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
- if (!(Model.getFacade().isAClass(dm))) return NO_PROBLEM;
+ if (!(Model.getFacade().isAClass(dm))) {
+ return NO_PROBLEM;
+ }
- if (!(Model.getFacade().isPrimaryObject(dm))) return NO_PROBLEM;
+ if (!(Model.getFacade().isPrimaryObject(dm))) {
+ return NO_PROBLEM;
+ }
// if the object does not have a name,
// than no problem
if ((Model.getFacade().getName(dm) == null)
- || ("".equals(Model.getFacade().getName(dm)))) {
+ || ("".equals(Model.getFacade().getName(dm)))) {
return NO_PROBLEM;
- }
+ }
// types can probably have variables, but we should not nag at them
// not having any.
- if (Model.getFacade().isType(dm)) return NO_PROBLEM;
+ if (Model.getFacade().isType(dm)) {
+ return NO_PROBLEM;
+ }
// utility is a namespace collection - also not strictly
// required to have variables.
- if (Model.getFacade().isUtility(dm)) return NO_PROBLEM;
+ if (Model.getFacade().isUtility(dm)) {
+ return NO_PROBLEM;
+ }
- if (findChangeableInstanceAttributeInInherited(dm, 0))
+ if (findChangeableInstanceAttributeInInherited(dm, 0)) {
return NO_PROBLEM;
+ }
return PROBLEM_FOUND;
}
@@ -88,6 +98,7 @@
/*
* @see org.argouml.cognitive.Poster#getClarifier()
*/
+ @Override
public Icon getClarifier() {
return ClAttributeCompartment.getTheInstance();
}
@@ -101,7 +112,7 @@
* or in any of its generalizations.
*/
private boolean findChangeableInstanceAttributeInInherited(Object dm,
- int depth) {
+ int depth) {
Iterator attribs = Model.getFacade().getAttributes(dm).iterator();
@@ -110,9 +121,10 @@
// If we find an instance variable that is not a constant
// we have succeeded
- if (Model.getFacade().isInstanceScope(attr)
- && Model.getFacade().isChangeable(attr))
- return true;
+ if (!Model.getFacade().isStatic(attr)
+ && !Model.getFacade().isReadOnly(attr)) {
+ return true;
+ }
}
// I am only prepared to go this far.
@@ -127,10 +139,11 @@
if (parent == dm)
continue;
- if (Model.getFacade().isAClassifier(parent))
- if (findChangeableInstanceAttributeInInherited(parent,
- depth + 1))
- return true;
+ if (Model.getFacade().isAClassifier(parent)
+ && findChangeableInstanceAttributeInInherited(
+ parent, depth + 1)) {
+ return true;
+ }
}
return false;
@@ -140,6 +153,7 @@
* @see org.argouml.cognitive.critics.Critic#initWizard(
* org.argouml.cognitive.ui.Wizard)
*/
+ @Override
public void initWizard(Wizard w) {
if (w instanceof WizAddInstanceVariable) {
String ins = super.getInstructions();
@@ -152,8 +166,9 @@
/*
* @see org.argouml.cognitive.critics.Critic#getWizardClass(org.argouml.cognitive.ToDoItem)
*/
+ @Override
public Class getWizardClass(ToDoItem item) {
return WizAddInstanceVariable.class;
}
-} /* end class CrNoInstanceVariables */
+}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrNoOperations.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrNoOperations.java?view=diff&rev=12731&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrNoOperations.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrNoOperations.java&r1=12730&r2=12731
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrNoOperations.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrNoOperations.java 2007-05-30 12:06:18-0700
@@ -55,31 +55,43 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
- if (!(Model.getFacade().isAClass(dm)
- || Model.getFacade().isAInterface(dm))) return NO_PROBLEM;
+ if (!(Model.getFacade().isAClass(dm)
+ || Model.getFacade().isAInterface(dm))) {
+ return NO_PROBLEM;
+ }
- if (!(Model.getFacade().isPrimaryObject(dm))) return NO_PROBLEM;
+ if (!(Model.getFacade().isPrimaryObject(dm))) {
+ return NO_PROBLEM;
+ }
// if the object does not have a name,
// than no problem
if ((Model.getFacade().getName(dm) == null)
- || ("".equals(Model.getFacade().getName(dm))))
- return NO_PROBLEM;
+ || ("".equals(Model.getFacade().getName(dm)))) {
+ return NO_PROBLEM;
+ }
+
// types can probably contain operations, but we should not nag at them
// not having any.
- if (Model.getFacade().isType(dm)) return NO_PROBLEM;
+ if (Model.getFacade().isType(dm)) {
+ return NO_PROBLEM;
+ }
// utility is a namespace collection - also not strictly
// required to have operations.
- if (Model.getFacade().isUtility(dm)) return NO_PROBLEM;
+ if (Model.getFacade().isUtility(dm)) {
+ return NO_PROBLEM;
+ }
//TODO: different critic or special message for classes
//that inherit all ops but define none of their own.
- if (findInstanceOperationInInherited(dm, 0))
+ if (findInstanceOperationInInherited(dm, 0)) {
return NO_PROBLEM;
+ }
return PROBLEM_FOUND;
}
@@ -87,6 +99,7 @@
/*
* @see org.argouml.cognitive.Poster#getClarifier()
*/
+ @Override
public Icon getClarifier() {
return ClOperationCompartment.getTheInstance();
}
@@ -95,8 +108,9 @@
Iterator ops = Model.getFacade().getOperations(dm).iterator();
while (ops.hasNext()) {
- if (Model.getFacade().isInstanceScope(ops.next()))
+ if (!Model.getFacade().isStatic(ops.next())) {
return true;
+ }
}
if (depth > 50)
@@ -110,9 +124,10 @@
if (parent == dm)
continue;
- if (Model.getFacade().isAClassifier(parent))
- if (findInstanceOperationInInherited(parent, depth + 1))
- return true;
+ if (Model.getFacade().isAClassifier(parent)
+ && findInstanceOperationInInherited(parent, depth + 1)) {
+ return true;
+ }
}
return false;
@@ -122,6 +137,7 @@
* @see org.argouml.cognitive.critics.Critic#initWizard(
* org.argouml.cognitive.ui.Wizard)
*/
+ @Override
public void initWizard(Wizard w) {
if (w instanceof WizAddOperation) {
String ins = super.getInstructions();
@@ -134,6 +150,9 @@
/*
* @see org.argouml.cognitive.critics.Critic#getWizardClass(org.argouml.cognitive.ToDoItem)
*/
- public Class getWizardClass(ToDoItem item) { return WizAddOperation.class; }
-} /* end class CrNoOperations */
+ @Override
+ public Class getWizardClass(ToDoItem item) {
+ return WizAddOperation.class;
+ }
+}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrUtilityViolated.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrUtilityViolated.java?view=diff&rev=12731&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrUtilityViolated.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrUtilityViolated.java&r1=12730&r2=12731
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrUtilityViolated.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrUtilityViolated.java 2007-05-30 12:06:18-0700
@@ -58,6 +58,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
// we could check for base class of the stereotype but the
// condition normally covers it all.
@@ -79,18 +80,18 @@
if (!Model.getFacade().isAInterface(o)) {
Iterator it2 = Model.getFacade().getAttributes(o).iterator();
while (it2.hasNext()) {
- if (Model.getFacade().isInstanceScope(it2.next())) {
+ if (!Model.getFacade().isStatic(it2.next())) {
return PROBLEM_FOUND;
}
}
}
Iterator it2 = Model.getFacade().getOperations(o).iterator();
while (it2.hasNext()) {
- if (Model.getFacade().isInstanceScope(it2.next())) {
+ if (!Model.getFacade().isStatic(it2.next())) {
return PROBLEM_FOUND;
}
}
}
return NO_PROBLEM;
}
-} /* end class CrUtilityViolated */
+}
Modified: trunk/src_new/org/argouml/uml/reveng/java/Modeller.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/reveng/java/Modeller.java?view=diff&rev=12731&p1=trunk/src_new/org/argouml/uml/reveng/java/Modeller.java&p2=trunk/src_new/org/argouml/uml/reveng/java/Modeller.java&r1=12730&r2=12731
==============================================================================
--- trunk/src_new/org/argouml/uml/reveng/java/Modeller.java (original)
+++ trunk/src_new/org/argouml/uml/reveng/java/Modeller.java 2007-05-30 12:06:18-0700
@@ -1365,9 +1365,9 @@
}
if ((modifiers & JavaRecognizer.ACC_FINAL) > 0) {
- Model.getCoreHelper().setChangeable(mAttribute, false);
- } else if (!Model.getFacade().isChangeable(mAttribute)) {
- Model.getCoreHelper().setChangeable(mAttribute, true);
+ Model.getCoreHelper().setReadOnly(mAttribute, true);
+ } else if (Model.getFacade().isReadOnly(mAttribute)) {
+ Model.getCoreHelper().setReadOnly(mAttribute, true);
}
addDocumentationTag(mAttribute, javadoc);
}
@@ -1383,7 +1383,7 @@
Model.getCoreHelper().setType(mAssociationEnd, mClassifier);
Model.getCoreHelper().setName(mAssociationEnd, name);
if ((modifiers & JavaRecognizer.ACC_FINAL) > 0) {
- Model.getCoreHelper().setChangeable(mAssociationEnd, false);
+ Model.getCoreHelper().setReadOnly(mAssociationEnd, true);
}
if (!mClassifier.equals(parseState.getClassifier())) {
// Because if they are equal,
@@ -1820,13 +1820,8 @@
'static'.
*/
private void setOwnerScope(Object feature, short modifiers) {
- if ((modifiers & JavaRecognizer.ACC_STATIC) > 0) {
- Model.getCoreHelper().setOwnerScope(feature,
- Model.getScopeKind().getClassifier());
- } else {
- Model.getCoreHelper().setOwnerScope(feature,
- Model.getScopeKind().getInstance());
- }
+ Model.getCoreHelper().setStatic(
+ feature, (modifiers & JavaRecognizer.ACC_STATIC) > 0);
}
/**
@@ -1837,6 +1832,8 @@
'static'.
*/
private void setTargetScope(Object mAssociationEnd, short modifiers) {
+ // TODO: Review what this is trying to do and what it should
+ // be replaced by. Target Scope is gone in UML 2.x - tfm 20070529
if ((modifiers & JavaRecognizer.ACC_STATIC) > 0) {
Model.getCoreHelper().setTargetScope(
mAssociationEnd,
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/ActionSetChangeability.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/ActionSetChangeability.java?view=diff&rev=12731&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/ActionSetChangeability.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/ActionSetChangeability.java&r1=12730&r2=12731
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/ActionSetChangeability.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/ActionSetChangeability.java 2007-05-30 12:06:18-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -44,6 +44,7 @@
/**
* ADDONLY_COMMAND determines a changeability kind.
+ * TODO: Removed from UML 2.x. Phase out of UI - tfm - 20070529
*/
public static final String ADDONLY_COMMAND = "addonly";
@@ -80,15 +81,16 @@
if (Model.getFacade().isAAssociationEnd(target)
|| Model.getFacade().isAAttribute(target)) {
Object m = target;
- Object kind = null;
if (actionCommand.equals(CHANGEABLE_COMMAND)) {
- kind = Model.getChangeableKind().getChangeable();
+ Model.getCoreHelper().setReadOnly(m, false);
} else if (actionCommand.equals(ADDONLY_COMMAND)) {
- kind = Model.getChangeableKind().getAddOnly();
+ // TODO: Removed from UML 2.x - phase out usage - tfm 20070530
+ Model.getCoreHelper().setChangeability(
+ m, Model.getChangeableKind().getAddOnly());
} else {
- kind = Model.getChangeableKind().getFrozen();
+ Model.getCoreHelper().setReadOnly(m, true);
}
- Model.getCoreHelper().setChangeability(m, kind);
+
}
}
}
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/ActionSetFeatureOwnerScope.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/ActionSetFeatureOwnerScope.java?view=diff&rev=12731&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/ActionSetFeatureOwnerScope.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/ActionSetFeatureOwnerScope.java&r1=12730&r2=12731
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/ActionSetFeatureOwnerScope.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/ActionSetFeatureOwnerScope.java 2007-05-30 12:06:18-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -61,14 +61,7 @@
UMLCheckBox2 source = (UMLCheckBox2) e.getSource();
Object target = source.getTarget();
if (Model.getFacade().isAFeature(target)) {
- Object m = target;
- if (source.isSelected()) {
- Model.getCoreHelper().setOwnerScope(m,
- Model.getScopeKind().getClassifier());
- } else {
- Model.getCoreHelper().setOwnerScope(m,
- Model.getScopeKind().getInstance());
- }
+ Model.getCoreHelper().setStatic(target, source.isSelected());
}
}
}
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.