Author: bobtarling
Date: 2010-07-24 03:01:49-0700
New Revision: 18555
Modified:
trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java
trunk/src/argouml-app/src/org/argouml/ui/StylePanelFigNodeModelElement.java
trunk/src/argouml-app/src/org/argouml/ui/StylePanelFigRRect.java
trunk/src/argouml-app/src/org/argouml/ui/StylePanelFigText.java
Log:
Issue 6109: Ignore refresh method if multiple selections
Modified: trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java?view=diff&pathrev=18555&r1=18554&r2=18555
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java 2010-07-24 03:01:49-0700
@@ -244,6 +244,13 @@
* have not changed.<p>
*/
public void refresh() {
+ if (TargetManager.getInstance().getTargets().size() > 1) {
+ // See issue 6109 - if we have multiple targets this method
+ // can result in a feedback problem where selecting a target
+ // changes the selection colour in the combo and as a result
+ // that trigger a change of colour of all selected Figs
+ return;
+ }
Fig target = getPanelTarget();
//TODO: How about FigAssociationClass?
if (target instanceof FigEdgeModelElement) {
Modified: trunk/src/argouml-app/src/org/argouml/ui/StylePanelFigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/StylePanelFigNodeModelElement.java?view=diff&pathrev=18555&r1=18554&r2=18555
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/StylePanelFigNodeModelElement.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/StylePanelFigNodeModelElement.java 2010-07-24 03:01:49-0700
@@ -51,6 +51,7 @@
import javax.swing.JPanel;
import org.argouml.i18n.Translator;
+import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.PathContainer;
import org.tigris.gef.presentation.Fig;
import org.tigris.gef.ui.ColorRenderer;
@@ -129,6 +130,13 @@
* @see org.argouml.ui.TabTarget#refresh()
*/
public void refresh() {
+ if (TargetManager.getInstance().getTargets().size() > 1) {
+ // See issue 6109 - if we have multiple targets this method
+ // can result in a feedback problem where selecting a target
+ // changes the selection colour in the combo and as a result
+ // that trigger a change of colour of all selected Figs
+ return;
+ }
refreshTransaction = true;
// Let the parent do its refresh.
super.refresh();
Modified: trunk/src/argouml-app/src/org/argouml/ui/StylePanelFigRRect.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/StylePanelFigRRect.java?view=diff&pathrev=18555&r1=18554&r2=18555
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/StylePanelFigRRect.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/StylePanelFigRRect.java 2010-07-24 03:01:49-0700
@@ -44,6 +44,7 @@
import javax.swing.text.Document;
import org.argouml.i18n.Translator;
+import org.argouml.ui.targetmanager.TargetManager;
import org.tigris.gef.presentation.FigRRect;
/**
@@ -78,6 +79,13 @@
* @see org.argouml.ui.TabTarget#refresh()
*/
public void refresh() {
+ if (TargetManager.getInstance().getTargets().size() > 1) {
+ // See issue 6109 - if we have multiple targets this method
+ // can result in a feedback problem where selecting a target
+ // changes the selection colour in the combo and as a result
+ // that trigger a change of colour of all selected Figs
+ return;
+ }
super.refresh();
String roundingStr =
((FigRRect) getPanelTarget()).getCornerRadius() + "";
Modified: trunk/src/argouml-app/src/org/argouml/ui/StylePanelFigText.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/StylePanelFigText.java?view=diff&pathrev=18555&r1=18554&r2=18555
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/StylePanelFigText.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/StylePanelFigText.java 2010-07-24 03:01:49-0700
@@ -45,6 +45,7 @@
import javax.swing.JLabel;
import org.argouml.i18n.Translator;
+import org.argouml.ui.targetmanager.TargetManager;
import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigText;
import org.tigris.gef.ui.ColorRenderer;
@@ -170,6 +171,13 @@
* @see org.argouml.ui.TabTarget#refresh()
*/
public void refresh() {
+ if (TargetManager.getInstance().getTargets().size() > 1) {
+ // See issue 6109 - if we have multiple targets this method
+ // can result in a feedback problem where selecting a target
+ // changes the selection colour in the combo and as a result
+ // that trigger a change of colour of all selected Figs
+ return;
+ }
super.refresh();
FigText ft = (FigText) getPanelTarget();
if (ft == null) {
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2637625
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.