Author: bobtarling
Date: 2010-09-25 14:40:39-0700
New Revision: 18777
Modified:
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/Expandable.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/LabelledComponent.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/RowSelector.java
Log:
Move more control over expansion of controls into LabelledComponent
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/Expandable.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/Expandable.java?view=diff&pathrev=18777&r1=18776&r2=18777
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/Expandable.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/Expandable.java 2010-09-25 14:40:39-0700
@@ -25,6 +25,6 @@
interface Expandable {
boolean isExpandable();
boolean isExpanded();
- void toggleExpansion();
+ void setExpanded(boolean expanded);
JComponent getExpansion();
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/LabelledComponent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/LabelledComponent.java?view=diff&pathrev=18777&r1=18776&r2=18777
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/LabelledComponent.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/LabelledComponent.java 2010-09-25 14:40:39-0700
@@ -95,6 +95,9 @@
* expansion feature to user.
*/
private final JLabel expander;
+
+ private final JPanel leftPanel;
+
static {
// Extract the icon that is used by the tree control
@@ -129,7 +132,7 @@
JPanel labelPanel = new JPanel();
labelPanel.setLayout(new BoxLayout(labelPanel, BoxLayout.X_AXIS));
labelPanel.add(label);
- JPanel leftPanel = new JPanel();
+ leftPanel = new JPanel();
leftPanel.add(labelPanel, BorderLayout.CENTER);
add(leftPanel, BorderLayout.WEST);
if (component instanceof Expandable && ((Expandable) component).isExpandable()) {
@@ -138,7 +141,7 @@
addMouseListener(this);
setIcon();
if (EXPANDED_CONTROLS.contains(getId())) {
- toggleExpansion();
+ toggleExpansion((Expandable) component);
}
} else {
expander = null;
@@ -146,6 +149,7 @@
} else {
label = null;
expander = null;
+ leftPanel = null;
}
}
@@ -186,7 +190,7 @@
public void mouseClicked(MouseEvent e) {
if (e.getSource() == this) {
- toggleExpansion();
+ toggleExpansion((Expandable) component);
}
}
@@ -205,26 +209,28 @@
/**
* Toggle between expansion and contraction of the control
*/
- private void toggleExpansion() {
- ((Expandable) component).toggleExpansion();
+ private void toggleExpansion(Expandable expandable) {
+
+ boolean expanded = !expandable.isExpanded();
+
+ expandable.setExpanded(expanded);
- if (((Expandable) component).isExpanded()) {
+ if (expanded) {
EXPANDED_CONTROLS.add(getId());
} else {
EXPANDED_CONTROLS.remove(getId());
}
setIcon();
-// if (toolbar != null) {
-// toolbar.setVisible(expanded);
-// }
-//
-// // Force the parent to redraw
-// Component c = getParent();
-// if (c != null) {
-// c.invalidate();
-// c.validate();
-// }
+ if (expandable.getExpansion() != null) {
+ expandable.getExpansion().setVisible(expanded);
+ }
+
+ // Force the parent to redraw
+ Component c = component.getParent();
+ if (c != null) {
+ c.invalidate();
+ c.validate();
+ }
}
-
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/RowSelector.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/RowSelector.java?view=diff&pathrev=18777&r1=18776&r2=18777
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/RowSelector.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/RowSelector.java 2010-09-25 14:40:39-0700
@@ -46,14 +46,11 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
import javax.swing.Action;
import javax.swing.DefaultListModel;
import javax.swing.Icon;
import javax.swing.JComponent;
-import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
@@ -529,19 +526,12 @@
}
public void mouseClicked(MouseEvent e) {
- if (e.getSource() == this) {
- toggleExpansion();
- }
}
public void mouseEntered(MouseEvent e) {
- // TODO Auto-generated method stub
-
}
public void mouseExited(MouseEvent e) {
- // TODO Auto-generated method stub
-
}
public void mousePressed(MouseEvent e) {
@@ -574,22 +564,8 @@
}
}
- /**
- * Toggle between expansion and contraction of the control
- */
- public void toggleExpansion() {
- expanded = !expanded;
-
- if (toolbar != null) {
- toolbar.setVisible(expanded);
- }
-
- // Force the parent to redraw
- Component c = getParent();
- if (c != null) {
- c.invalidate();
- c.validate();
- }
+ public void setExpanded(boolean expanded) {
+ this.expanded = expanded;
}
public JComponent getExpansion() {
@@ -604,18 +580,6 @@
return expandable;
}
- private String getId() {
- final String id;
- ListModel model = getList().getModel();
- if (model instanceof SimpleListModel) {
- SimpleListModel slm = (SimpleListModel) model;
- id = slm.getPropertyName() + ":" + slm.getMetaType();
- } else {
- id = model.getClass().getName();
- }
- return id;
- }
-
/**
* Remove all the listeners that were added in the constructor
*/
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2664595
To unsubscribe from this discussion, e-mail: [[email protected]].
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.