merge conflict

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BCheckbox.java

@@ -63,15 +63,4 @@ public class BCheckbox extends BControl {
 		}
 	}
 
-	@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);
-	}
-
 }

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BRadioButton.java

@@ -80,19 +80,4 @@ 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);
-	}
-
 }

de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BRadioButtonPart.java

@@ -134,9 +134,6 @@ public class BRadioButtonPart extends AppAbstractEditPart {
 			}
 		}
 
-		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
 					.toString()));