Author: mvw
Date: 2008-08-11 11:59:23-0700
New Revision: 15549
Modified:
trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/SelectionComponentInstance.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionClass.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionGeneralizableElement.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionInterface.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionStereotype.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/SelectionActor.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/SelectionUseCase.java
Log:
Fix for issue 5301 for more elements.
Style improvements on previous commits for this issue.
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/SelectionComponentInstance.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/SelectionComponentInstance.java?view=diff&rev=15549&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/SelectionComponentInstance.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/SelectionComponentInstance.java&r1=15548&r2=15549
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/SelectionComponentInstance.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/SelectionComponentInstance.java 2008-08-11 11:59:23-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2007 The Regents of the University of California. All
+// Copyright (c) 1996-2008 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
@@ -70,6 +70,10 @@
@Override
protected Icon[] getIcons() {
+ if (Model.getModelManagementHelper().isReadOnly(
+ getContent().getOwner())) {
+ return new Icon[] {null, dep, depRight, null, null };
+ }
return icons;
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionClass.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionClass.java?view=diff&rev=15549&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionClass.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionClass.java&r1=15548&r2=15549
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionClass.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionClass.java 2008-08-11 11:59:23-0700
@@ -107,7 +107,7 @@
// Readonly class: no generalization, no association to self
if (Model.getModelManagementHelper().isReadOnly(
getContent().getOwner())) {
- return new Icon[] { null, inherit, null, null, null };
+ return new Icon[] {null, inherit, null, null, null };
}
return workingIcons;
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionGeneralizableElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionGeneralizableElement.java?view=diff&rev=15549&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionGeneralizableElement.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionGeneralizableElement.java&r1=15548&r2=15549
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionGeneralizableElement.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionGeneralizableElement.java 2008-08-11 11:59:23-0700
@@ -89,7 +89,7 @@
}
if (Model.getModelManagementHelper().isReadOnly(
getContent().getOwner())) {
- return new Icon[] { null, inherit, null, null, null };
+ return new Icon[] {null, inherit, null, null, null };
}
return icons;
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionInterface.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionInterface.java?view=diff&rev=15549&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionInterface.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionInterface.java&r1=15548&r2=15549
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionInterface.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionInterface.java 2008-08-11 11:59:23-0700
@@ -106,7 +106,7 @@
protected Icon[] getIcons() {
if (Model.getModelManagementHelper().isReadOnly(
getContent().getOwner())) {
- return new Icon[] { null, realiz, null, null, null };
+ return new Icon[] {null, realiz, null, null, null };
}
return icons;
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionStereotype.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionStereotype.java?view=diff&rev=15549&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionStereotype.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionStereotype.java&r1=15548&r2=15549
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionStereotype.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionStereotype.java 2008-08-11 11:59:23-0700
@@ -134,7 +134,7 @@
}
if (Model.getModelManagementHelper().isReadOnly(
getContent().getOwner())) {
- return new Icon[] { null, dependIcon, null, null, null };
+ return new Icon[] {null, dependIcon, null, null, null };
}
return icons;
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/SelectionActor.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/SelectionActor.java?view=diff&rev=15549&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/SelectionActor.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/SelectionActor.java&r1=15548&r2=15549
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/SelectionActor.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/SelectionActor.java 2008-08-11 11:59:23-0700
@@ -84,7 +84,7 @@
protected Icon[] getIcons() {
if (Model.getModelManagementHelper().isReadOnly(
getContent().getOwner())) {
- return new Icon[] { null, generalizationIcon, null, null, null };
+ return new Icon[] {null, generalizationIcon, null, null, null };
}
return icons;
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/SelectionUseCase.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/SelectionUseCase.java?view=diff&rev=15549&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/SelectionUseCase.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/SelectionUseCase.java&r1=15548&r2=15549
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/SelectionUseCase.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/SelectionUseCase.java 2008-08-11 11:59:23-0700
@@ -81,7 +81,7 @@
protected Icon[] getIcons() {
if (Model.getModelManagementHelper().isReadOnly(
getContent().getOwner())) {
- return new Icon[] { null, inherit, null, null, null };
+ return new Icon[] {null, inherit, null, null, null };
}
return icons;
}
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.