Author: tfmorris
Date: 2007-08-03 13:08:03-0700
New Revision: 13230
Modified:
trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java
trunk/src_new/org/argouml/uml/diagram/ui/FigDependency.java
trunk/src_new/org/argouml/uml/diagram/ui/FigPermission.java
trunk/src_new/org/argouml/uml/diagram/ui/ModeCreatePermission.java
trunk/src_new/org/argouml/uml/reveng/java/Modeller.java
trunk/src_new/org/argouml/uml/ui/TabProps.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelPermission.java
Log:
Update references to deprecated Permission methods.
Modified: trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java?view=diff&rev=13230&p1=trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java&p2=trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java&r1=13229&r2=13230
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java 2007-08-03 13:08:03-0700
@@ -355,7 +355,7 @@
" " + menuLocalize("menu.popup.extends") + " ");
addCreateModelElementAction(
menuItems,
- Model.getMetaTypes().getPermission(),
+ Model.getMetaTypes().getPackageImport(),
" " + menuLocalize("menu.popup.has-permission-on") + " ");
addCreateModelElementAction(
menuItems,
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java?view=diff&rev=13230&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java&r1=13229&r2=13230
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java 2007-08-03 13:08:03-0700
@@ -424,7 +424,7 @@
if (actionPermission == null) {
actionPermission = makeCreateDependencyAction(
ModeCreatePermission.class,
- Model.getMetaTypes().getPermission(),
+ Model.getMetaTypes().getPackageImport(),
"button.new-permission");
}
Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigDependency.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigDependency.java?view=diff&rev=13230&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigDependency.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigDependency.java&r1=13229&r2=13230
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigDependency.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigDependency.java 2007-08-03 13:08:03-0700
@@ -132,5 +132,5 @@
middleGroup.calcBounds();
}
-} /* end class FigRealization */
+}
Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigPermission.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigPermission.java?view=diff&rev=13230&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigPermission.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigPermission.java&r1=13229&r2=13230
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigPermission.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigPermission.java 2007-08-03 13:08:03-0700
@@ -28,7 +28,13 @@
/**
* The Fig for a permission, which is a form of dependency.
- *
+ * <p>
+ * TODO: In UML 2.x, the import and access Permissions have become
+ * PackageImports with public visibility and non-public visibility respectively.
+ * (ArgoUML only supports the <<import>> Permission currently). The friend
+ * Permission has been dropped. Also the type hierarchy has been reorganized so
+ * that PackageImport is not a subtype of Dependency.
+ *
* @author Markus Klink
*/
public class FigPermission extends FigDependency {
@@ -60,5 +66,5 @@
super(edge, lay);
}
-} /* end class FigPermission */
+}
Modified: trunk/src_new/org/argouml/uml/diagram/ui/ModeCreatePermission.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ModeCreatePermission.java?view=diff&rev=13230&p1=trunk/src_new/org/argouml/uml/diagram/ui/ModeCreatePermission.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ModeCreatePermission.java&r1=13229&r2=13230
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ModeCreatePermission.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ModeCreatePermission.java 2007-08-03 13:08:03-0700
@@ -30,11 +30,15 @@
* A Mode to interpret user input while creating a permission edge.
* The permission can connect any model elements including those represented
* by edges as well as nodes.
+ * <p>
+ * TODO: In UML 2.x, Permission becomes PackageImport and the class hierarchy
+ * has changed so that it is no longer a subtype of Dependency, so this may
+ * need to be refactored to work correctly.
*/
public final class ModeCreatePermission extends ModeCreateDependency {
protected final Object getMetaType() {
- return Model.getMetaTypes().getPermission();
+ return Model.getMetaTypes().getPackageImport();
}
}
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=13230&p1=trunk/src_new/org/argouml/uml/reveng/java/Modeller.java&p2=trunk/src_new/org/argouml/uml/reveng/java/Modeller.java&r1=13229&r2=13230
==============================================================================
--- trunk/src_new/org/argouml/uml/reveng/java/Modeller.java (original)
+++ trunk/src_new/org/argouml/uml/reveng/java/Modeller.java 2007-08-03 13:08:03-0700
@@ -329,35 +329,23 @@
// import on demand
if (classifierName.equals("*")) {
parseState.addPackageContext(mPackage);
- Object perm = null;
-
+
// try find an existing permission
- Iterator dependenciesIt =
- Model.getCoreHelper()
- .getDependencies(mPackage, parseState.getComponent())
- .iterator();
- while (dependenciesIt.hasNext()) {
-
- Object dependency = dependenciesIt.next();
- if (Model.getFacade().isAPermission(dependency)) {
-
- perm = dependency;
- break;
- }
- }
+ Object pkgImport = Model.getCoreHelper().getPackageImport(mPackage,
+ parseState.getComponent());
// if no existing permission was found.
- if (perm == null) {
- perm =
+ if (pkgImport == null) {
+ pkgImport =
Model.getCoreFactory()
- .buildPermission(parseState.getComponent(), mPackage);
+ .buildPackageImport(parseState.getComponent(), mPackage);
String newName =
makePermissionName(
Model.getFacade().getName(
parseState.getComponent()),
packageName);
- Model.getCoreHelper().setName(perm, newName);
- newElements.add(perm);
+ Model.getCoreHelper().setName(pkgImport, newName);
+ newElements.add(pkgImport);
}
}
// single type import
@@ -389,28 +377,28 @@
.getDependencies(mClassifier,
parseState.getComponent())
.iterator();
- Object perm = null;
+ Object pkgImport = null;
while (dependenciesIt.hasNext()) {
Object dependency = dependenciesIt.next();
- if (Model.getFacade().isAPermission(dependency)) {
+ if (Model.getFacade().isAPackageImport(dependency)) {
- perm = dependency;
+ pkgImport = dependency;
break;
}
}
// if no existing permission was found.
- if (perm == null) {
- perm =
+ if (pkgImport == null) {
+ pkgImport =
Model.getCoreFactory()
- .buildPermission(parseState.getComponent(),
+ .buildPackageImport(parseState.getComponent(),
mClassifier);
String newName =
makePermissionName(
parseState.getComponent(), mClassifier);
- Model.getCoreHelper().setName(perm, newName);
- newElements.add(perm);
+ Model.getCoreHelper().setName(pkgImport, newName);
+ newElements.add(pkgImport);
}
}
}
Modified: trunk/src_new/org/argouml/uml/ui/TabProps.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/TabProps.java?view=diff&rev=13230&p1=trunk/src_new/org/argouml/uml/ui/TabProps.java&p2=trunk/src_new/org/argouml/uml/ui/TabProps.java&r1=13229&r2=13230
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/TabProps.java (original)
+++ trunk/src_new/org/argouml/uml/ui/TabProps.java 2007-08-03 13:08:03-0700
@@ -462,7 +462,7 @@
propPanel = new PropPanelParameter();
} else if (Model.getFacade().isAPartition(modelElement)) {
propPanel = new PropPanelPartition();
- } else if (Model.getFacade().isAPermission(modelElement)) {
+ } else if (Model.getFacade().isAPackageImport(modelElement)) {
propPanel = new PropPanelPermission();
} else if (Model.getFacade().isAPseudostate(modelElement)) {
propPanel = new PropPanelPseudostate();
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelPermission.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelPermission.java?view=diff&rev=13230&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelPermission.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelPermission.java&r1=13229&r2=13230
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelPermission.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelPermission.java 2007-08-03 13:08:03-0700
@@ -30,7 +30,12 @@
/**
* The properties panel for a Permission.
- *
+ * <p>
+ * TODO: In UML 2.x, the import and access Permissions have become
+ * PackageImports with public visibility and non-public visibility respectively.
+ * (ArgoUML only supports the <<import>> Permission currently). The friend
+ * Permission has been dropped. Also the type hierarchy has been reorganized so
+ * that PackageImport is not a subtype of Dependency.
*/
public class PropPanelPermission extends PropPanelDependency {
@@ -61,5 +66,5 @@
addAction(getDeleteAction());
}
-} /* end class PropPanelPermission */
+}
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.