Adapt PropertyEditor interface to work with Draw2D points

Follow-up to fe14a8a. By using Draw2D points instead of SWT points, we don't have to use the fully qualified name.
ptziegler · Apr 30, 2024 · 53affba · 53affba
1 parent fe14a8a
commit 53affba
Show file tree

Hide file tree

Showing 21 changed files with 54 additions and 59 deletions.
diff --git a/...c/org/eclipse/wb/internal/core/model/property/editor/ConstantSelectionPropertyEditor.java b/...c/org/eclipse/wb/internal/core/model/property/editor/ConstantSelectionPropertyEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2024 Google, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -35,6 +35,7 @@
 import org.eclipse.wb.internal.core.utils.ui.GridLayoutFactory;
 import org.eclipse.wb.internal.core.utils.ui.dialogs.ResizableDialog;
 
+import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.jdt.core.Flags;
 import org.eclipse.jdt.core.IField;
 import org.eclipse.jdt.core.IJavaProject;
@@ -65,7 +66,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Group;

diff --git a/...c/org/eclipse/wb/internal/core/model/property/editor/DisplayExpressionPropertyEditor.java b/...c/org/eclipse/wb/internal/core/model/property/editor/DisplayExpressionPropertyEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2024 Google, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,8 +15,8 @@
 import org.eclipse.wb.internal.core.model.property.table.PropertyTable;
 import org.eclipse.wb.internal.core.utils.ast.AstEditor;
 
+import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.swt.graphics.Point;
 
 /**
  * {@link PropertyEditor} that displays source of {@link Expression} from {@link GenericProperty}.

diff --git a/...java/src/org/eclipse/wb/internal/core/model/property/editor/InnerClassPropertyEditor.java b/...java/src/org/eclipse/wb/internal/core/model/property/editor/InnerClassPropertyEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2024 Google, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,13 +30,13 @@
 import org.eclipse.wb.internal.core.utils.state.EditorState;
 import org.eclipse.wb.internal.core.utils.ui.UiUtils;
 
+import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.jdt.core.Flags;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.dom.ClassInstanceCreation;
 import org.eclipse.jdt.core.dom.Expression;
 import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Shell;
 
 import org.apache.commons.lang3.StringUtils;
@@ -52,24 +52,24 @@
  * instance of selected external {@link Class}. Source for class generated class is configured as
  * template.
  *
- * <pre><xmp>
-	<property id="setLabelProvider(org.eclipse.jface.viewers.IBaseLabelProvider)">
-		<editor id="innerClass">
-			<parameter name="mode">inner</parameter>
-			<parameter name="name">TableLabelProvider</parameter>
-			<parameter name="class">org.eclipse.jface.viewers.ITableLabelProvider</parameter>
-			<parameter name="source"><![CDATA[
-private class ${name} extends org.eclipse.jface.viewers.LabelProvider implements org.eclipse.jface.viewers.ITableLabelProvider {
-	public org.eclipse.swt.graphics.Image getColumnImage(Object element, int columnIndex) {
-		return null;
-	}
-	public String getColumnText(Object element, int columnIndex) {
-		return element.toString();
-	}
-}
-			]]></parameter>
-		</editor>
-	</property>
+ * <pre><xmp>
+	<property id="setLabelProvider(org.eclipse.jface.viewers.IBaseLabelProvider)">
+		<editor id="innerClass">
+			<parameter name="mode">inner</parameter>
+			<parameter name="name">TableLabelProvider</parameter>
+			<parameter name="class">org.eclipse.jface.viewers.ITableLabelProvider</parameter>
+			<parameter name="source"><![CDATA[
+private class ${name} extends org.eclipse.jface.viewers.LabelProvider implements org.eclipse.jface.viewers.ITableLabelProvider {
+	public org.eclipse.swt.graphics.Image getColumnImage(Object element, int columnIndex) {
+		return null;
+	}
+	public String getColumnText(Object element, int columnIndex) {
+		return element.toString();
+	}
+}
+			]]></parameter>
+		</editor>
+	</property>
  * </xmp></pre>
  *
  * @author scheglov_ke

diff --git a/.../eclipse/wb/internal/core/model/property/editor/complex/InstanceObjectPropertyEditor.java b/.../eclipse/wb/internal/core/model/property/editor/complex/InstanceObjectPropertyEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2024 Google, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -37,6 +37,7 @@
 import org.eclipse.wb.internal.core.utils.execution.RunnableEx;
 import org.eclipse.wb.internal.core.utils.state.EditorState;
 
+import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.dom.ClassInstanceCreation;
@@ -48,7 +49,6 @@
 import org.eclipse.jdt.ui.JavaUI;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.window.Window;
-import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.dialogs.SelectionDialog;
 

diff --git a/...a/src/org/eclipse/wb/internal/core/model/property/event/ListenerMethodPropertyEditor.java b/...a/src/org/eclipse/wb/internal/core/model/property/event/ListenerMethodPropertyEditor.java
@@ -18,7 +18,7 @@
 import org.eclipse.wb.internal.core.utils.execution.ExecutionUtils;
 import org.eclipse.wb.internal.core.utils.execution.RunnableEx;
 
-import org.eclipse.swt.graphics.Point;
+import org.eclipse.draw2d.geometry.Point;
 
 /**
  * Implementation of {@link PropertyEditor} for {@link ListenerMethodProperty}.

diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/property/ComplexProperty.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/property/ComplexProperty.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2024 Google, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,7 +17,7 @@
 import org.eclipse.wb.internal.core.model.property.table.PropertyTooltipProvider;
 import org.eclipse.wb.internal.core.model.property.table.PropertyTooltipTextProvider;
 
-import org.eclipse.swt.graphics.Point;
+import org.eclipse.draw2d.geometry.Point;
 
 import java.util.List;
 

diff --git a/...rc/org/eclipse/wb/internal/core/model/property/editor/AbstractComboBoxPropertyEditor.java b/...rc/org/eclipse/wb/internal/core/model/property/editor/AbstractComboBoxPropertyEditor.java
@@ -17,14 +17,14 @@
 import org.eclipse.wb.internal.core.utils.execution.ExecutionUtils;
 import org.eclipse.wb.internal.core.utils.execution.RunnableEx;
 
+import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.FocusAdapter;
 import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 
 /**

diff --git a/...e/src/org/eclipse/wb/internal/core/model/property/editor/AbstractComboPropertyEditor.java b/...e/src/org/eclipse/wb/internal/core/model/property/editor/AbstractComboPropertyEditor.java
@@ -14,14 +14,14 @@
 import org.eclipse.wb.internal.core.model.property.Property;
 import org.eclipse.wb.internal.core.model.property.table.PropertyTable;
 
+import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.FocusAdapter;
 import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;

diff --git a/...re/src/org/eclipse/wb/internal/core/model/property/editor/AbstractTextPropertyEditor.java b/...re/src/org/eclipse/wb/internal/core/model/property/editor/AbstractTextPropertyEditor.java
@@ -13,11 +13,11 @@
 import org.eclipse.wb.internal.core.model.property.Property;
 import org.eclipse.wb.internal.core.model.property.table.PropertyTable;
 
+import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;

diff --git a/...e/src/org/eclipse/wb/internal/core/model/property/editor/BooleanObjectPropertyEditor.java b/...e/src/org/eclipse/wb/internal/core/model/property/editor/BooleanObjectPropertyEditor.java
@@ -16,8 +16,8 @@
 import org.eclipse.wb.internal.core.utils.ui.DrawUtils;
 
 import org.eclipse.draw2d.Graphics;
+import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
 
 /**
  * The {@link PropertyEditor} for <code>Boolean</code>.

diff --git a/...wb.core/src/org/eclipse/wb/internal/core/model/property/editor/BooleanPropertyEditor.java b/...wb.core/src/org/eclipse/wb/internal/core/model/property/editor/BooleanPropertyEditor.java
@@ -16,8 +16,8 @@
 import org.eclipse.wb.internal.core.utils.ui.DrawUtils;
 
 import org.eclipse.draw2d.Graphics;
+import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
 
 /**
  * The {@link PropertyEditor} for <code>boolean</code>.

diff --git a/...clipse.wb.core/src/org/eclipse/wb/internal/core/model/property/editor/PropertyEditor.java b/...clipse.wb.core/src/org/eclipse/wb/internal/core/model/property/editor/PropertyEditor.java
@@ -16,10 +16,10 @@
 import org.eclipse.wb.internal.core.utils.IAdaptable;
 
 import org.eclipse.draw2d.Graphics;
+import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;

diff --git a/...core/src/org/eclipse/wb/internal/core/model/property/editor/TextDialogPropertyEditor.java b/...core/src/org/eclipse/wb/internal/core/model/property/editor/TextDialogPropertyEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2024 Google, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,7 +15,7 @@
 import org.eclipse.wb.internal.core.model.property.editor.presentation.PropertyEditorPresentation;
 import org.eclipse.wb.internal.core.model.property.table.PropertyTable;
 
-import org.eclipse.swt.graphics.Point;
+import org.eclipse.draw2d.geometry.Point;
 
 /**
  * Abstract {@link PropertyEditor} that displays text and button to open dialog.

diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/property/table/PropertyTable.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/property/table/PropertyTable.java
@@ -28,6 +28,7 @@
 import org.eclipse.draw2d.FigureUtilities;
 import org.eclipse.draw2d.Graphics;
 import org.eclipse.draw2d.SWTGraphics;
+import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.gef.ui.parts.GraphicalViewerImpl;
 import org.eclipse.jface.viewers.ISelection;
@@ -499,7 +500,7 @@ private void updateTooltipNoProperty() {
 	 * @param location the mouse location, if editor is activated using mouse click,
 	 *                 or <code>null</code> if it is activated using keyboard.
 	 */
-	public void activateEditor(Property property, org.eclipse.swt.graphics.Point location) {
+	public void activateEditor(Property property, Point location) {
 		try {
 			// de-activate old editor
 			deactivateEditor(true);
@@ -700,8 +701,8 @@ private boolean isLocationValue(int x) {
 	 *
 	 * @return the location relative to the value part of property.
 	 */
-	private org.eclipse.swt.graphics.Point getValueRelativeLocation(int x, int y) {
-		return new org.eclipse.swt.graphics.Point(x - (m_splitter + 2), y - m_rowHeight * getPropertyIndex(y));
+	private Point getValueRelativeLocation(int x, int y) {
+		return new Point(x - (m_splitter + 2), y - m_rowHeight * getPropertyIndex(y));
 	}
 
 	////////////////////////////////////////////////////////////////////////////

diff --git a/...rg/eclipse/wb/internal/rcp/model/jface/viewers/TableViewerColumnSorterPropertyEditor.java b/...rg/eclipse/wb/internal/rcp/model/jface/viewers/TableViewerColumnSorterPropertyEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2024 Google, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -24,9 +24,9 @@
 import org.eclipse.wb.internal.core.utils.jdt.core.ProjectUtils;
 import org.eclipse.wb.internal.rcp.Activator;
 
+import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.graphics.Point;
 
 /**
  * {@link PropertyEditor} for installing sorter of {@link TableViewer} by column.

diff --git a/...ing/src/org/eclipse/wb/internal/swing/model/property/editor/beans/TextPropertyEditor.java b/...ing/src/org/eclipse/wb/internal/swing/model/property/editor/beans/TextPropertyEditor.java
@@ -20,7 +20,7 @@
 import org.eclipse.wb.internal.core.model.property.table.PropertyTable;
 
 import org.eclipse.draw2d.Graphics;
-import org.eclipse.swt.graphics.Point;
+import org.eclipse.draw2d.geometry.Point;
 
 /**
  * The {@link PropertyEditor} wrapper for text based AWT {@link java.beans.PropertyEditor}.

diff --git a/...ng/src/org/eclipse/wb/internal/swing/model/property/editor/color/ColorPropertyEditor.java b/...ng/src/org/eclipse/wb/internal/swing/model/property/editor/color/ColorPropertyEditor.java
@@ -34,6 +34,7 @@
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.draw2d.ColorConstants;
 import org.eclipse.draw2d.Graphics;
+import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.jdt.core.dom.Expression;
 import org.eclipse.jdt.core.dom.MethodInvocation;
 import org.eclipse.jdt.core.dom.QualifiedName;
@@ -44,7 +45,6 @@
 import org.eclipse.swt.custom.ScrolledComposite;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 

diff --git a/....swt/src/org/eclipse/wb/internal/swt/model/property/editor/color/ColorPropertyEditor.java b/....swt/src/org/eclipse/wb/internal/swt/model/property/editor/color/ColorPropertyEditor.java
@@ -45,6 +45,7 @@
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.draw2d.ColorConstants;
 import org.eclipse.draw2d.Graphics;
+import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.jdt.core.dom.Expression;
 import org.eclipse.jdt.core.dom.MethodInvocation;
 import org.eclipse.jdt.core.dom.QualifiedName;
@@ -55,7 +56,6 @@
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Composite;
 

diff --git a/...se.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/EventsPropertyTest.java b/...se.wb.tests/src/org/eclipse/wb/tests/designer/core/model/property/EventsPropertyTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 Google, Inc.
+ * Copyright (c) 2011, 2024 Google, Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -2285,9 +2285,7 @@ public void test_ListenerMethodPropertyEditor_doubleClick() throws Exception {
 		// open "keyPressed" method
 		{
 			PropertyEditor keyPressedEditor = keyPressedProperty.getEditor();
-			ReflectionUtils.invokeMethod(keyPressedEditor, "doubleClick("
-					+ Property.class.getName()
-					+ ",org.eclipse.swt.graphics.Point)", new Object[]{keyPressedProperty, null});
+			keyPressedEditor.doubleClick(keyReleasedProperty, null);
 			assertEditor(
 					"class Test extends JPanel {",
 					"  Test() {",
@@ -2305,7 +2303,7 @@ public void test_ListenerMethodPropertyEditor_doubleClick() throws Exception {
 
 	/**
 	 * Create listener method using
-	 * {@link PropertyEditor#activate(PropertyTable, Property, org.eclipse.swt.graphics.Point)}.
+	 * {@link PropertyEditor#activate(PropertyTable, Property, org.eclipse.draw2d.geometry.Point)}.
 	 */
 	@Test
 	public void test_ListenerMethodPropertyEditor_activate() throws Exception {
@@ -2324,11 +2322,7 @@ public void test_ListenerMethodPropertyEditor_activate() throws Exception {
 		// open "keyPressed" method
 		{
 			PropertyEditor keyPressedEditor = keyPressedProperty.getEditor();
-			ReflectionUtils.invokeMethod(keyPressedEditor, "activate("
-					+ PropertyTable.class.getName()
-					+ ","
-					+ Property.class.getName()
-					+ ",org.eclipse.swt.graphics.Point)", new Object[]{null, keyPressedProperty, null});
+			keyPressedEditor.activate(null, keyPressedProperty, null);
 			assertEditor(
 					"class Test extends JPanel {",
 					"  Test() {",

diff --git a/...eclipse/wb/tests/designer/core/model/property/editor/BooleanObjectPropertyEditorTest.java b/...eclipse/wb/tests/designer/core/model/property/editor/BooleanObjectPropertyEditorTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2024 Google, Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,7 +16,7 @@
 import org.eclipse.wb.internal.core.model.property.table.PropertyTable;
 import org.eclipse.wb.internal.swing.model.component.ContainerInfo;
 
-import org.eclipse.swt.graphics.Point;
+import org.eclipse.draw2d.geometry.Point;
 
 import org.junit.Test;