Skip to content
Snippets Groups Projects
Commit 3bf0b9d7 authored by Johannes Eder's avatar Johannes Eder
Browse files

cleaned up code 

Issue-Ref: 4018
Issue-Url: https://af3-developer.fortiss.org/issues/4018



Signed-off-by: default avatarJohannes Eder <eder@fortiss.org>
parent acb36c6c
No related branches found
No related tags found
1 merge request!1244018 error view java fx
Hide whitespace changes
Inline Side-by-side
Showing
with 49 additions and 82 deletions
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/MarkerService.java
+ 6
− 6
View file @ 3bf0b9d7
......@@ -43,7 +43,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.ErrorViewFXViewPart;
import org.fortiss.tooling.kernel.ui.internal.views.ErrorViewFX.ErrorViewFXLayoutController;
import org.fortiss.tooling.kernel.ui.service.IMarkerService;
/**
......@@ -77,8 +77,8 @@ public class MarkerService implements IMarkerService, IPersistencyServiceListene
private final UIJob updateUI = new UIJob("Update Model Decorators") {
@Override
public IStatus runInUIThread(IProgressMonitor monitor) {
if(markerView != null) {
markerView.refresh();
if(markerController != null) {
markerController.refresh();
}
return Status.OK_STATUS;
}
......@@ -91,7 +91,7 @@ public class MarkerService implements IMarkerService, IPersistencyServiceListene
private final List<ITopLevelElement> invalidElements = new LinkedList<ITopLevelElement>();
/** Stores the marker view. */
private ErrorViewFXViewPart markerView;
private ErrorViewFXLayoutController markerController;
/** Stores the constraint checking job. */
private final Job constraintCheckerJob = new Job("Model Constraint Checker Job") {
......@@ -139,8 +139,8 @@ public class MarkerService implements IMarkerService, IPersistencyServiceListene
}
/** Sets the current marker view. */
public void setMarkerViewPart(ErrorViewFXViewPart view) {
this.markerView = view;
public void setMarkerViewPart(ErrorViewFXLayoutController errorViewFXLayoutController) {
this.markerController = errorViewFXLayoutController;
}
/** {@inheritDoc} */
......
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/ErrorViewFX/ErrorViewFXLayoutController.java
+ 25
− 38
View file @ 3bf0b9d7
......@@ -15,9 +15,7 @@
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.kernel.ui.internal.views.ErrorViewFX;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.fortiss.tooling.common.ui.javafx.control.treetableview.DynamicTreeContentProviderBase;
......@@ -25,6 +23,8 @@ import org.fortiss.tooling.common.ui.javafx.control.treetableview.DynamicTreeTab
import org.fortiss.tooling.common.ui.javafx.control.treetableview.DynamicTreeTableViewer;
import org.fortiss.tooling.common.ui.javafx.layout.CompositeFXControllerBase;
import org.fortiss.tooling.kernel.extension.data.IConstraintViolation.ESeverity;
import org.fortiss.tooling.kernel.ui.internal.MarkerService;
import org.fortiss.tooling.kernel.ui.service.IMarkerService;
import javafx.fxml.FXML;
import javafx.scene.Node;
......@@ -32,16 +32,10 @@ import javafx.scene.control.CheckBox;
import javafx.scene.layout.BorderPane;
/**
*
*
* Controller class for the "marker view". References the FXML layout and contains all control
*
* logic.
*
*
*
* @author abid
*
*/
public class ErrorViewFXLayoutController extends CompositeFXControllerBase<Node, Node> {
......@@ -65,22 +59,16 @@ public class ErrorViewFXLayoutController extends CompositeFXControllerBase<Node,
@FXML
private BorderPane pane;
@SuppressWarnings("javadoc")
int btnOption = 0;
/** Toggle State */
@SuppressWarnings("unused")
private Map<ESeverity, Boolean> toggleState = new HashMap<ESeverity, Boolean>();
/** Tree table */
private DynamicTreeTableViewer<Object> treeTable;
/** */
List<ESeverity> SevrList = new ArrayList<ESeverity>();
/**
* @param toggleState
*/
/** Constructor. */
@SuppressWarnings("unchecked")
public ErrorViewFXLayoutController(Map<ESeverity, Boolean> toggleState) {
this.toggleState = toggleState;
((MarkerService)IMarkerService.getInstance()).setMarkerViewPart(this);
}
/** Called when debug checkbox is pushed. */
......@@ -88,9 +76,9 @@ public class ErrorViewFXLayoutController extends CompositeFXControllerBase<Node,
if(!debugBtn.isSelected()) {
toggleState.put(ESeverity.DEBUG, true);
} else {
toggleState.remove(ESeverity.DEBUG);
toggleState.put(ESeverity.DEBUG, false);
}
initialize();
refresh();
}
/** Called when info check-box is pushed. */
......@@ -98,20 +86,19 @@ public class ErrorViewFXLayoutController extends CompositeFXControllerBase<Node,
if(infoBtn.isSelected()) {
toggleState.put(ESeverity.INFO, true);
} else {
toggleState.remove(ESeverity.INFO);
toggleState.put(ESeverity.INFO, false);
}
initialize();
refresh();
}
/** Called when warning check-box is pushed. */
public void onWarningBtn() {
if(warningBtn.isSelected()) {
toggleState.put(ESeverity.WARNING, true);
} else {
toggleState.remove(ESeverity.WARNING);
toggleState.put(ESeverity.WARNING, false);
}
initialize();
refresh();
}
/** Called when error check-box is pushed. */
......@@ -119,21 +106,19 @@ public class ErrorViewFXLayoutController extends CompositeFXControllerBase<Node,
if(errorBtn.isSelected()) {
toggleState.put(ESeverity.ERROR, true);
} else {
toggleState.remove(ESeverity.ERROR);
toggleState.put(ESeverity.ERROR, false);
}
initialize();
refresh();
}
/** Called when fatal check-box is pushed. */
public void onFatalBtn() {
if(fatalBtn.isSelected()) {
toggleState.put(ESeverity.FATAL, true);
} else {
toggleState.put(ESeverity.FATAL, false);
}
if(fatalBtn.isPressed()) {
toggleState.remove(ESeverity.FATAL);
}
initialize();
refresh();
}
/** {@inheritDoc} */
......@@ -142,16 +127,18 @@ public class ErrorViewFXLayoutController extends CompositeFXControllerBase<Node,
return "ErrorViewFXLayout.fxml";
}
/** Refreshes the tree table. */
public void refresh() {
treeTable.update();
}
/** {@inheritDoc} */
@Override
public void initialize() {
DynamicTreeContentProviderBase<Object> contentProvider = new MarkerViewFXContentProvider();
DynamicTreeTableUIProviderBase<Object> uiProvider = new MarkerViewFXUIProvider(this);
SevrList.clear();
SevrList.addAll(toggleState.keySet());
DynamicTreeTableViewer<Object> treeTable =
new DynamicTreeTableViewer<Object>(SevrList, false, 2, contentProvider, uiProvider);
DynamicTreeTableUIProviderBase<Object> uiProvider = new MarkerViewFXUIProvider();
treeTable = new DynamicTreeTableViewer<Object>(toggleState, false, 2, contentProvider,
uiProvider);
treeTable.addColumn("Severity", 80);
treeTable.addColumn("Element", 80);
treeTable.addColumn("Explanation", 80);
......
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/ErrorViewFX/ErrorViewFXViewPart.java
+ 1
− 9
View file @ 3bf0b9d7
......@@ -20,8 +20,6 @@ import java.util.Map;
import org.fortiss.tooling.common.ui.javafx.AF3FXViewPart;
import org.fortiss.tooling.kernel.extension.data.IConstraintViolation.ESeverity;
import org.fortiss.tooling.kernel.ui.internal.MarkerService;
import org.fortiss.tooling.kernel.ui.service.IMarkerService;
/**
*
......@@ -31,7 +29,7 @@ import org.fortiss.tooling.kernel.ui.service.IMarkerService;
*
* Wrapper for the {@link ErrorViewFXViewPart}. This class can be referenced in the
*
* {@code plugins.xml} file to register the view.
* {@code plugin.xml} file to register the view.
*
*
*
......@@ -51,16 +49,10 @@ public class ErrorViewFXViewPart extends AF3FXViewPart {
public ErrorViewFXViewPart() throws Exception {
super(new ErrorViewFXLayoutController(toggleState), null);
((MarkerService)IMarkerService.getInstance()).setMarkerViewPart(this);
}
/** Called when there are error marker updates. */
public void refresh() {
}
/** Returns toggleState. */
/* package */Boolean getToggleState(ESeverity sev) {
return toggleState.get(sev);
}
}
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/ErrorViewFX/MarkerViewFXContentProvider.java
+ 13
− 13
View file @ 3bf0b9d7
......@@ -17,7 +17,8 @@ package org.fortiss.tooling.kernel.ui.internal.views.ErrorViewFX;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.fortiss.tooling.common.ui.javafx.control.treetableview.DynamicTreeContentProviderBase;
import org.fortiss.tooling.kernel.extension.data.IConstraintViolation;
......@@ -30,24 +31,23 @@ import org.fortiss.tooling.kernel.ui.service.IMarkerService;
*/
public class MarkerViewFXContentProvider extends DynamicTreeContentProviderBase<Object> {
private ErrorViewFXViewPart markerViewFXViewPart;
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override
public Collection<? extends Object> getChildren(Object parent) {
List<ESeverity> servList = new ArrayList<ESeverity>();
Collection<IConstraintViolation> violation_list = new ArrayList<IConstraintViolation>();
if(parent instanceof List) {
servList = (List)parent;
for(int i = 0; i < servList.size(); i++) {
violation_list.addAll(IMarkerService.getInstance()
.getAllViolationsWithSeverity((ESeverity)servList.get(i)));
Map<ESeverity, Boolean> servList;
Collection<IConstraintViolation<?>> violation_list =
new ArrayList<IConstraintViolation<?>>();
if(parent instanceof Map<?, ?>) {
servList = (Map<ESeverity, Boolean>)parent;
for(Entry<ESeverity, Boolean> e : servList.entrySet()) {
if(e.getValue()) {
violation_list.addAll(
IMarkerService.getInstance().getAllViolationsWithSeverity(e.getKey()));
}
}
return violation_list;
}
return null;
}
}
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/ErrorViewFX/MarkerViewFXUIProvider.java
+ 4
− 16
View file @ 3bf0b9d7
......@@ -33,16 +33,6 @@ import javafx.scene.control.ContextMenu;
*/
public class MarkerViewFXUIProvider extends DynamicTreeTableUIProviderBase<Object> {
ErrorViewFXLayoutController errorViewFXLayoutController;
/**
* @param errorViewFXLayoutController
*/
public MarkerViewFXUIProvider(ErrorViewFXLayoutController errorViewFXLayoutController) {
// TODO Auto-generated constructor stub
this.errorViewFXLayoutController = errorViewFXLayoutController;
}
/** {@inheritDoc} */
@Override
/** {@inheritDoc} */
......@@ -72,10 +62,9 @@ public class MarkerViewFXUIProvider extends DynamicTreeTableUIProviderBase<Objec
if(element instanceof IConstraintViolation) {
switch(col) {
case 0: // Severity Column
return ((IConstraintViolation)element).getSeverity().toString();
return ((IConstraintViolation<?>)element).getSeverity().toString();
case 1: // Element Column
IConstraintViolation<? extends EObject> violation =
(IConstraintViolation<? extends EObject>)element;
IConstraintViolation<?> violation = (IConstraintViolation<?>)element;
IModelElementHandlerService hs = IModelElementHandlerService.getInstance();
IModelElementHandler<EObject> handler =
hs.getModelElementHandler(violation.getSource());
......@@ -83,10 +72,9 @@ public class MarkerViewFXUIProvider extends DynamicTreeTableUIProviderBase<Objec
return handler.getName(violation.getSource());
}
case 2: // Explanation Column
return ((IConstraintViolation)element).getExplanation();
return ((IConstraintViolation<?>)element).getExplanation();
case 3: // Project Column
IConstraintViolation<? extends EObject> violation_prj =
(IConstraintViolation<? extends EObject>)element;
IConstraintViolation<?> violation_prj = (IConstraintViolation<?>)element;
IPersistencyService ps = IPersistencyService.getInstance();
ITopLevelElement topElement =
ps.getTopLevelElementFor(violation_prj.getSource());
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment