From d8cc6a6d84e81160fa4680a5071e81e4a038afad Mon Sep 17 00:00:00 2001
From: Johannes Eder <eder@fortiss.org>
Date: Wed, 12 Aug 2020 14:05:39 +0200
Subject: [PATCH] YELLOW
Issue-Ref: 4018
Issue-Url: https://af3-developer.fortiss.org/issues/4018
Signed-off-by: Johannes Eder <eder@fortiss.org>
---
.../org/fortiss/tooling/common/ui/javafx/util/.ratings | 2 +-
org.fortiss.tooling.kernel.ui/.classpath | 1 +
org.fortiss.tooling.kernel.ui/plugin.xml | 4 ++--
.../kernel/ui/internal/views/fx}/ErrorViewFXLayout.fxml | 0
.../src/org/fortiss/tooling/kernel/ui/.ratings | 2 +-
.../tooling/kernel/ui/ToolingKernelUIActivator.java | 1 +
.../src/org/fortiss/tooling/kernel/ui/internal/.ratings | 2 +-
.../fortiss/tooling/kernel/ui/internal/MarkerService.java | 2 +-
.../fortiss/tooling/kernel/ui/internal/views/fx/.ratings | 4 ++++
.../{ErrorViewFX => fx}/ErrorViewFXLayoutController.java | 3 ++-
.../views/{ErrorViewFX => fx}/ErrorViewFXViewPart.java | 8 +-------
.../{ErrorViewFX => fx}/MarkerViewFXContentProvider.java | 3 ++-
.../views/{ErrorViewFX => fx}/MarkerViewFXUIProvider.java | 3 ++-
.../src/org/fortiss/tooling/kernel/ui/service/.ratings | 2 +-
.../fortiss/tooling/kernel/ui/service/IMarkerService.java | 2 +-
15 files changed, 21 insertions(+), 18 deletions(-)
rename org.fortiss.tooling.kernel.ui/{src/org/fortiss/tooling/kernel/ui/internal/views/ErrorViewFX => res/org/fortiss/tooling/kernel/ui/internal/views/fx}/ErrorViewFXLayout.fxml (100%)
create mode 100644 org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/fx/.ratings
rename org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/{ErrorViewFX => fx}/ErrorViewFXLayoutController.java (98%)
rename org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/{ErrorViewFX => fx}/ErrorViewFXViewPart.java (95%)
rename org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/{ErrorViewFX => fx}/MarkerViewFXContentProvider.java (95%)
rename org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/{ErrorViewFX => fx}/MarkerViewFXUIProvider.java (97%)
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/util/.ratings b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/util/.ratings
index 124679275..47abd4dfa 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/util/.ratings
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/util/.ratings
@@ -1,2 +1,2 @@
GraphicUtils.java 9373a2c7a5ebb0d87284d0f6f983348812e5b90d GREEN
-JavaFXUtils.java db3cf28289109ffec64c8f96c7b2de779a977b3b GREEN
+JavaFXUtils.java 1f7d16c1af5ba938276c09f5ecb89c6add84061e YELLOW
diff --git a/org.fortiss.tooling.kernel.ui/.classpath b/org.fortiss.tooling.kernel.ui/.classpath
index 4eba2db1f..04e39cd5e 100644
--- a/org.fortiss.tooling.kernel.ui/.classpath
+++ b/org.fortiss.tooling.kernel.ui/.classpath
@@ -7,5 +7,6 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry excluding="org/fortiss/tooling/kernel/ui/internal/views/MarkerViewEditorFX/SimpleAnnotationTableFXController.java|org/fortiss/tooling/kernel/ui/internal/views/MarkerViewEditorFX/SimpleAnnotationTableFXViewPart.java" kind="src" path="src"/>
+ <classpathentry kind="src" path="res"/>
<classpathentry kind="output" path="build"/>
</classpath>
diff --git a/org.fortiss.tooling.kernel.ui/plugin.xml b/org.fortiss.tooling.kernel.ui/plugin.xml
index 94e069bb7..a88f3123f 100644
--- a/org.fortiss.tooling.kernel.ui/plugin.xml
+++ b/org.fortiss.tooling.kernel.ui/plugin.xml
@@ -49,9 +49,9 @@
</view>
<view
- class="org.fortiss.tooling.kernel.ui.internal.views.ErrorViewFX.ErrorViewFXViewPart"
+ class="org.fortiss.tooling.kernel.ui.internal.views.fx.ErrorViewFXViewPart"
icon="icons/marker_view.gif"
- id="org.fortiss.tooling.kernel.ui.internal.views.ErrorViewFX.ErrorViewFXViewPart"
+ id="org.fortiss.tooling.kernel.ui.internal.views.fx.ErrorViewFXViewPart"
name="Marker View FX"
restorable="true">
</view>
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/ErrorViewFX/ErrorViewFXLayout.fxml b/org.fortiss.tooling.kernel.ui/res/org/fortiss/tooling/kernel/ui/internal/views/fx/ErrorViewFXLayout.fxml
similarity index 100%
rename from org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/ErrorViewFX/ErrorViewFXLayout.fxml
rename to org.fortiss.tooling.kernel.ui/res/org/fortiss/tooling/kernel/ui/internal/views/fx/ErrorViewFXLayout.fxml
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/.ratings
index 4c8db7b8f..6a7646068 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/.ratings
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/.ratings
@@ -1,3 +1,3 @@
ESharedImages.java d33fea62344c1654b5da296fb51a18098cb09eed GREEN
ToolingKernelUI.java 250e5dde230272e286aa8d327fd597cf542774fe GREEN
-ToolingKernelUIActivator.java fc281e60592e54bd606d0b6667168afdfde8389e GREEN
+ToolingKernelUIActivator.java 94420418da064146fbbf40244d5a5b0d277696bf YELLOW
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/ToolingKernelUIActivator.java b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/ToolingKernelUIActivator.java
index b6a0f60de..94420418d 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/ToolingKernelUIActivator.java
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/ToolingKernelUIActivator.java
@@ -94,6 +94,7 @@ public class ToolingKernelUIActivator extends AbstractUIPlugin {
ESharedImages.registerImages(registry);
}
+ /** Returns an FX {@link ImageView} for the given icon path. Null otherwise. */
public static ImageView getFXImage(String iconPath) {
try {
ImageView iv = new ImageView(iconPath);
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/.ratings
index bb65e43fe..2bdcc613e 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/.ratings
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/.ratings
@@ -2,7 +2,7 @@ ActionService.java e29126b5947c9fd2f1d82bb87001b9d0ead50c3b GREEN
AllocationEditPartFactoryService.java 81bd227736013f1157ba9d0f79a9f3deefe10064 GREEN
ContextMenuService.java ca3c899293f25b70ce8e5f0d86ca2f9683329d81 GREEN
EditPartFactoryService.java e9180c0020f1769d9e24ef3c08f9ca5599dbc5c3 GREEN
-MarkerService.java 208f97f3ccabf0947702a17ddca23d8766a268f4 GREEN
+MarkerService.java 505296c356f8d66c5c009b6d6181a971d02a9501 YELLOW
ModelEditorBindingService.java d980691db4b700714c0669050014d08751354d5e GREEN
ModelElementHandlerService.java eeb07f6926012aa98256d452d1e554a5486dc657 GREEN
NavigatorService.java 1d773dde3791ddf7051616fe249558e7e307757d GREEN
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/MarkerService.java b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/MarkerService.java
index 7f076182b..505296c35 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/MarkerService.java
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/MarkerService.java
@@ -44,7 +44,7 @@ import org.fortiss.tooling.kernel.extension.data.ITopLevelElement;
import org.fortiss.tooling.kernel.service.IConstraintCheckerService;
import org.fortiss.tooling.kernel.service.IPersistencyService;
import org.fortiss.tooling.kernel.service.listener.IPersistencyServiceListener;
-import org.fortiss.tooling.kernel.ui.internal.views.ErrorViewFX.ErrorViewFXLayoutController;
+import org.fortiss.tooling.kernel.ui.internal.views.fx.ErrorViewFXLayoutController;
import org.fortiss.tooling.kernel.ui.service.IMarkerService;
import javafx.scene.image.ImageView;
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/fx/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/fx/.ratings
new file mode 100644
index 000000000..96d3bce57
--- /dev/null
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/fx/.ratings
@@ -0,0 +1,4 @@
+ErrorViewFXLayoutController.java 448847b34278c1561dca19858afdfb4992b8ca7c YELLOW
+ErrorViewFXViewPart.java 59a600a274045829c4a3edcbfd80abb845fc336e YELLOW
+MarkerViewFXContentProvider.java ecf92449414b2b8648ad151bc932189baa23dc12 YELLOW
+MarkerViewFXUIProvider.java c5719d95ac7bd5605fff65d6150eca8b9ca6fc02 YELLOW
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/ErrorViewFX/ErrorViewFXLayoutController.java b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/fx/ErrorViewFXLayoutController.java
similarity index 98%
rename from org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/ErrorViewFX/ErrorViewFXLayoutController.java
rename to org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/fx/ErrorViewFXLayoutController.java
index ebe565fa5..448847b34 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/ErrorViewFX/ErrorViewFXLayoutController.java
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/fx/ErrorViewFXLayoutController.java
@@ -13,7 +13,7 @@
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.ui.internal.views.ErrorViewFX;
+package org.fortiss.tooling.kernel.ui.internal.views.fx;
import static org.fortiss.tooling.common.ui.javafx.util.JavaFXUtils.createToolTip;
import static org.fortiss.tooling.kernel.extension.data.IConstraintViolation.ESeverity.DEBUG;
@@ -186,5 +186,6 @@ public class ErrorViewFXLayoutController extends CompositeFXControllerBase<Node,
warningBtn.setSelected(true);
pane.setCenter(treeTable.getControl());
+ refresh();
}
}
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/ErrorViewFX/ErrorViewFXViewPart.java b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/fx/ErrorViewFXViewPart.java
similarity index 95%
rename from org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/ErrorViewFX/ErrorViewFXViewPart.java
rename to org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/fx/ErrorViewFXViewPart.java
index d3d31dd1d..59a600a27 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/ErrorViewFX/ErrorViewFXViewPart.java
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/fx/ErrorViewFXViewPart.java
@@ -13,7 +13,7 @@
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.ui.internal.views.ErrorViewFX;
+package org.fortiss.tooling.kernel.ui.internal.views.fx;
import java.util.HashMap;
import java.util.Map;
@@ -25,16 +25,10 @@ import org.fortiss.tooling.kernel.extension.data.IConstraintViolation.ESeverity;
*
* JavaFX view part of the Marker View.
*
- *
- *
* Wrapper for the {@link ErrorViewFXViewPart}. This class can be referenced in the
- *
* {@code plugin.xml} file to register the view.
*
- *
- *
* @author abid
- *
*/
public class ErrorViewFXViewPart extends AF3FXViewPart {
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/ErrorViewFX/MarkerViewFXContentProvider.java b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/fx/MarkerViewFXContentProvider.java
similarity index 95%
rename from org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/ErrorViewFX/MarkerViewFXContentProvider.java
rename to org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/fx/MarkerViewFXContentProvider.java
index 200539a33..ecf924494 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/ErrorViewFX/MarkerViewFXContentProvider.java
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/fx/MarkerViewFXContentProvider.java
@@ -13,7 +13,7 @@
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.ui.internal.views.ErrorViewFX;
+package org.fortiss.tooling.kernel.ui.internal.views.fx;
import java.util.ArrayList;
import java.util.Collection;
@@ -26,6 +26,7 @@ import org.fortiss.tooling.kernel.extension.data.IConstraintViolation.ESeverity;
import org.fortiss.tooling.kernel.ui.service.IMarkerService;
/**
+ * Content provider for the error marker view.
*
* @author abid
*/
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/ErrorViewFX/MarkerViewFXUIProvider.java b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/fx/MarkerViewFXUIProvider.java
similarity index 97%
rename from org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/ErrorViewFX/MarkerViewFXUIProvider.java
rename to org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/fx/MarkerViewFXUIProvider.java
index 1ad4fa30b..c5719d95a 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/ErrorViewFX/MarkerViewFXUIProvider.java
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/fx/MarkerViewFXUIProvider.java
@@ -13,7 +13,7 @@
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.ui.internal.views.ErrorViewFX;
+package org.fortiss.tooling.kernel.ui.internal.views.fx;
import org.eclipse.emf.ecore.EObject;
import org.fortiss.tooling.common.ui.javafx.control.treetableview.DynamicTreeTableUIProviderBase;
@@ -28,6 +28,7 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
import javafx.scene.control.ContextMenu;
/**
+ * UI (label) provider for the marker view.
*
* @author abid
*/
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/service/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/service/.ratings
index c551f5934..570e0140b 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/service/.ratings
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/service/.ratings
@@ -2,7 +2,7 @@ IActionService.java 22eafafc8708cbff7f855f7b1b9bef042c127f25 GREEN
IAllocationEditPartFactoryService.java ac7243a8ff8a6c3f71937ecf3e63a04e271ca1d5 GREEN
IContextMenuService.java cfb6b8237b6cd2b0e461991a9ceb95969f330265 GREEN
IEditPartFactoryService.java c448bff63fb81f57037c9f1dc5319859c12d0c4d GREEN
-IMarkerService.java d433e838e387dd2fe61b8dea7395ebb7203ae39b GREEN
+IMarkerService.java c52acc1f68e909954554b3e9e2f2e232efb052cd YELLOW
IModelEditorBindingService.java ce2ae1957e2232bb0fac1d1d262103f9adfc5266 GREEN
IModelElementHandlerService.java 748ffd22d6836a5599f8785f023469eb58c80ece GREEN
INavigatorService.java 8fc66f7e554cfb547f2ce65dec9f48ac0559c54e GREEN
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/service/IMarkerService.java b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/service/IMarkerService.java
index fcd0b8d12..c52acc1f6 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/service/IMarkerService.java
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/service/IMarkerService.java
@@ -25,7 +25,7 @@ import org.fortiss.tooling.kernel.extension.data.IConstraintViolation.ESeverity;
import org.fortiss.tooling.kernel.extension.data.ITopLevelElement;
import org.fortiss.tooling.kernel.service.IConstraintCheckerService;
import org.fortiss.tooling.kernel.ui.internal.MarkerService;
-import org.fortiss.tooling.kernel.ui.internal.views.ErrorViewFX.ErrorViewFXViewPart;
+import org.fortiss.tooling.kernel.ui.internal.views.fx.ErrorViewFXViewPart;
import javafx.scene.image.ImageView;
--
GitLab