From ce39d3285f19e6d668ccebd58e1518cc8a00ae9a Mon Sep 17 00:00:00 2001
From: Lukas Ladenberger <lukas.ladenberger@gmx.de>
Date: Tue, 13 Dec 2011 11:22:32 +0100
Subject: [PATCH] merge conflict
---
.../bmotionstudio/gef/editor/model/BCheckbox.java | 11 -----------
.../gef/editor/model/BRadioButton.java | 15 ---------------
.../gef/editor/part/BRadioButtonPart.java | 3 ---
3 files changed, 29 deletions(-)
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BCheckbox.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BCheckbox.java
index 5732a48b..d6984cb8 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BCheckbox.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BCheckbox.java
@@ -62,16 +62,5 @@ public class BCheckbox extends BControl {
.toString();
}
}
-
- @Override
- public void executeEvent(String eventID) {
- if (Boolean.valueOf(getAttributeValue(
- AttributeConstants.ATTRIBUTE_CHECKED).toString())) {
- setAttributeValue(AttributeConstants.ATTRIBUTE_CHECKED, false);
- } else {
- setAttributeValue(AttributeConstants.ATTRIBUTE_CHECKED, true);
- }
- super.executeEvent(eventID);
- }
}
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BRadioButton.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BRadioButton.java
index 8a62d839..a05d99e1 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BRadioButton.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BRadioButton.java
@@ -79,20 +79,5 @@ public class BRadioButton extends BControl {
}
return "";
}
-
- @Override
- public void executeEvent(String eventID) {
- String btgroupid = getAttributeValue(
- AttributeConstants.ATTRIBUTE_BUTTONGROUP).toString();
- if (!btgroupid.trim().equals("")) {
- Collection<BControl> btGroup = ButtonGroupHelper
- .getButtonGroup(btgroupid);
- for (BControl control : btGroup) {
- control.setAttributeValue(AttributeConstants.ATTRIBUTE_CHECKED, false);
- }
- }
- setAttributeValue(AttributeConstants.ATTRIBUTE_CHECKED, true);
- super.executeEvent(eventID);
- }
}
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BRadioButtonPart.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BRadioButtonPart.java
index f7c7dc2d..f4ad340b 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BRadioButtonPart.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BRadioButtonPart.java
@@ -133,9 +133,6 @@ public class BRadioButtonPart extends AppAbstractEditPart {
(BControl) getModel());
}
}
-
- if (aID.equals(AttributeConstants.ATTRIBUTE_ENABLED))
- ((RadioButtonFigure) figure).setBtEnabled(Boolean.valueOf(value.toString()));
if (aID.equals(AttributeConstants.ATTRIBUTE_ENABLED))
((RadioButtonFigure) figure).setBtEnabled(Boolean.valueOf(value
--
GitLab