Author: bobtarling
Date: 2011-04-11 04:43:13-0700
New Revision: 19211
Added:
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionCompartmentText.java
- copied, changed from r19208,
/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionAttribute.java
Removed:
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionAttribute.java
Modified:
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigAttribute.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/CompartmentFigText.java
Log:
Rename SelectionAttribute -> SelectionCompartmentText
Modified:
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigAttribute.java
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigAttribute.java?view=diff&pathrev=19211&r1=19210&r2=19211
==============================================================================
---
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigAttribute.java
(original)
+++
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigAttribute.java
2011-04-11 04:43:13-0700
@@ -7,7 +7,8 @@
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * mvw
+ * Michiel van der Wulp
+ * Bob Tarling
*****************************************************************************
*
* Some portions of this file was previously release using the BSD License:
@@ -38,12 +39,10 @@
package org.argouml.uml.diagram.static_structure.ui;
-import java.awt.Graphics;
import java.awt.Rectangle;
import org.argouml.notation.NotationProviderFactory2;
import org.argouml.uml.diagram.DiagramSettings;
-import org.tigris.gef.base.Selection;
/**
* Fig with specific knowledge of Attribute display. <p>
@@ -73,12 +72,4 @@
protected int getNotationProviderType() {
return NotationProviderFactory2.TYPE_ATTRIBUTE;
}
-
- public Selection makeSelection() {
- return new SelectionAttribute(this);
- }
-
- public boolean isResizable() {
- return false;
- }
}
Removed:
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionAttribute.java
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionAttribute.java?view=markup&pathrev=19210
Copied:
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionCompartmentText.java
(from r19208,
/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionAttribute.java)
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionCompartmentText.java?view=diff&pathrev=19211&r1=19208&r2=19211
==============================================================================
---
/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionAttribute.java
(original)
+++
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionCompartmentText.java
2011-04-11 04:43:13-0700
@@ -1,14 +1,13 @@
-/* $Id: SelectionClass.java 19205 2011-04-10 21:31:56Z bobtarling $
+/* $Id: SelectionCompartmentText.java 19205 2011-04-10 21:31:56Z bobtarling $
*****************************************************************************
- * Copyright (c) 2009-2011 Contributors - see below
+ * Copyright (c) 2011 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Michiel van der Wulp
- * Katharina Fahnenbruck
+ * Bob Tarling
*****************************************************************************
*
* Some portions of this file was previously release using the BSD License:
@@ -41,21 +40,20 @@
import javax.swing.Icon;
-import org.argouml.model.Model;
import org.tigris.gef.presentation.Fig;
import org.argouml.uml.diagram.ui.SelectionNodeClarifiers2;
/**
- * @author [email protected]
+ * @author Bob Tarling
*/
-public class SelectionAttribute extends SelectionNodeClarifiers2 {
+public class SelectionCompartmentText extends SelectionNodeClarifiers2 {
/**
* Construct a new SelectionClass for the given Fig.
*
* @param f The given Fig.
*/
- public SelectionAttribute(Fig f) {
+ public SelectionCompartmentText(Fig f) {
super(f);
}
@@ -71,7 +69,7 @@
@Override
protected Object getNewNodeType(int i) {
- return Model.getMetaTypes().getAttribute();
+ return null;
}
@Override
Modified:
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/CompartmentFigText.java
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/CompartmentFigText.java?view=diff&pathrev=19211&r1=19210&r2=19211
==============================================================================
---
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/CompartmentFigText.java
(original)
+++
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/CompartmentFigText.java
2011-04-11 04:43:13-0700
@@ -42,6 +42,8 @@
import java.awt.Graphics;
import java.awt.Rectangle;
import org.argouml.uml.diagram.DiagramSettings;
+import org.argouml.uml.diagram.static_structure.ui.SelectionCompartmentText;
+import org.tigris.gef.base.Selection;
import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigGroup;
import org.tigris.gef.presentation.FigText;
@@ -134,4 +136,12 @@
public void paintClarifiers(Graphics g) {
}
+
+ public Selection makeSelection() {
+ return new SelectionCompartmentText(this);
+ }
+
+ public boolean isResizable() {
+ return false;
+ }
}
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2718827
To unsubscribe from this discussion, e-mail:
[[email protected]].
