MarkButton removed.

6 files changed, 20 insertions, 48 deletions

diff --git a/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/AbstractEmbeddedControl.java b/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/AbstractEmbeddedControl.java
index 08f486931..7f86356fa 100644
--- a/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/AbstractEmbeddedControl.java
+++ b/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/AbstractEmbeddedControl.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.fx.ecp.ui.ECPUtil;
 
 public abstract class AbstractEmbeddedControl extends HBox implements EmbeddedControl {
 
@@ -39,10 +40,11 @@ public abstract class AbstractEmbeddedControl extends HBox implements EmbeddedCo
 
 		if (feature.isOrdered()) {
 
-			upButton = new MarkButton("up-arrow");
+			upButton = new Button();
 			getChildren().add(upButton);
 			upButton.getStyleClass().addAll("up-button");
 			upButton.setMaxHeight(Double.MAX_VALUE);
+			ECPUtil.addMark(upButton, "up-arrow");
 			
 			upButton.setOnAction(new EventHandler<ActionEvent>() {
 
@@ -57,9 +59,10 @@ public abstract class AbstractEmbeddedControl extends HBox implements EmbeddedCo
 
 			});
 
-			downButton = new MarkButton("down-arrow");
+			downButton = new Button();
 			getChildren().add(downButton);
 			downButton.getStyleClass().addAll("down-button", "center-pill");
+			ECPUtil.addMark(downButton, "down-arrow");
 			
 			downButton.setOnAction(new EventHandler<ActionEvent>() {
 
@@ -77,9 +80,10 @@ public abstract class AbstractEmbeddedControl extends HBox implements EmbeddedCo
 
 		}
 
-		final Button deleteButton = new MarkButton("minus");
+		final Button deleteButton = new Button();
 		getChildren().add(deleteButton);
 		deleteButton.getStyleClass().addAll("remove-button", "right-pill");
+		ECPUtil.addMark(deleteButton, "cross");
 		
 		deleteButton.setOnAction(new EventHandler<ActionEvent>() {
 
diff --git a/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/EmbeddedReferenceControl.java b/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/EmbeddedReferenceControl.java
index b2cbbf4e9..e12ec7559 100644
--- a/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/EmbeddedReferenceControl.java
+++ b/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/EmbeddedReferenceControl.java
@@ -1,11 +1,9 @@
 package org.eclipse.fx.ecp.ui.controls.multi;
 
-import java.net.URL;
-
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
+import javafx.scene.Node;
 import javafx.scene.control.Hyperlink;
-import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 
@@ -13,9 +11,8 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.impl.AdapterImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecp.edit.ECPControlContext;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.fx.ecp.ui.ECPUtil;
 
 public class EmbeddedReferenceControl extends AbstractEmbeddedControl {
 
@@ -62,7 +59,7 @@ public class EmbeddedReferenceControl extends AbstractEmbeddedControl {
 		super.update();
 
 		if (eList.size() > index) {
-			final EObject newValue = (EObject) eList.get(index);
+			EObject newValue = (EObject) eList.get(index);
 
 			if (newValue != value) {
 				if (value != null)
@@ -71,21 +68,11 @@ public class EmbeddedReferenceControl extends AbstractEmbeddedControl {
 				value = newValue;
 			}
 
-			ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-
-			// TODO check why this is not working:
-			// IItemLabelProvider labelProvider =
-			// ComposedAdapterFactory.Descriptor.Registry.INSTANCE//(IItemLabelProvider)
-			// EcoreUtil.getRegisteredAdapter(value, IItemLabelProvider.class);
-			IItemLabelProvider labelProvider = (IItemLabelProvider) adapterFactory.adapt(value, IItemLabelProvider.class);
-
-			String text = labelProvider.getText(value);
-
-			URL image = (URL) labelProvider.getImage(value);
-			ImageView imageView = new ImageView(image.toExternalForm());
+			String text = ECPUtil.getText(value);
+			Node icon = ECPUtil.getGraphic(value);
 
 			hyperlink.setText(text);
-			hyperlink.setGraphic(imageView);
+			hyperlink.setGraphic(icon);
 		} else {
 			hyperlink.setText(null);
 			hyperlink.setGraphic(null);
diff --git a/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/EmbeddedTextFieldControl.java b/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/EmbeddedTextFieldControl.java
index d6e9beace..8483580b9 100644
--- a/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/EmbeddedTextFieldControl.java
+++ b/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/EmbeddedTextFieldControl.java
@@ -6,9 +6,7 @@ import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ObservableList;
 import javafx.geometry.Point2D;
-import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
-import javafx.scene.control.Tooltip;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.paint.Color;
@@ -117,10 +115,6 @@ public class EmbeddedTextFieldControl extends AbstractEmbeddedControl {
 							if (command.canExecute())
 								editingDomain.getCommandStack().execute(command);
 						}
-						// textField.getStyleClass().remove("error");
-					} else {
-						// if (!textField.getStyleClass().contains("error"))
-						// textField.getStyleClass().add("error");
 					}
 				}
 			}
diff --git a/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/EnumAddControl.java b/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/EnumAddControl.java
index d54febc14..e21abab30 100644
--- a/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/EnumAddControl.java
+++ b/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/EnumAddControl.java
@@ -10,7 +10,6 @@ import javafx.scene.control.Control;
 import javafx.scene.control.SingleSelectionModel;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
-import javafx.scene.layout.VBox;
 
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.notify.Notification;
@@ -24,6 +23,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.fx.ecp.ui.ECPUtil;
 
 public class EnumAddControl extends Control {
 
@@ -70,9 +70,10 @@ public class EnumAddControl extends Control {
 
 		});
 
-		addButton = new MarkButton("plus");
+		addButton = new Button();
 		hBox.getChildren().add(addButton);
 		addButton.getStyleClass().addAll("right-pill", "add-enum-button");
+		ECPUtil.addMark(addButton, "plus");
 		addButton.setOnAction(new EventHandler<ActionEvent>() {
 
 			@Override
diff --git a/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/MarkButton.java b/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/MarkButton.java
deleted file mode 100644
index 80faf2149..000000000
--- a/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/MarkButton.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.eclipse.fx.ecp.ui.controls.multi;
-
-import javafx.scene.Group;
-import javafx.scene.control.Button;
-import javafx.scene.layout.StackPane;
-
-public class MarkButton extends Button {
-	
-	public MarkButton(String styleClass) {
-		super();
-		StackPane upMark = new StackPane();
-		upMark.getStyleClass().add(styleClass);
-		setGraphic(new Group(upMark));
-	}
-
-}
diff --git a/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/TextFieldAddControl.java b/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/TextFieldAddControl.java
index 51a5084df..2c1792f3e 100644
--- a/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/TextFieldAddControl.java
+++ b/bundles/runtime/org.eclipse.fx.ecp.ui/src/org/eclipse/fx/ecp/ui/controls/multi/TextFieldAddControl.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.fx.ecp.ui.ECPUtil;
 
 public class TextFieldAddControl extends HBox {
 
@@ -66,11 +67,12 @@ public class TextFieldAddControl extends HBox {
 
 		});
 
-		addButton = new MarkButton("plus");
+		addButton = new Button();
 		getChildren().add(addButton);
 		addButton.setMaxHeight(Double.MAX_VALUE);
 		addButton.getStyleClass().addAll("right-pill", "text-field-add-button");
-
+		ECPUtil.addMark(addButton, "plus");
+		
 		addButton.setOnAction(new EventHandler<ActionEvent>() {
 
 			@Override