diff --git a/WoPeD-BPELExport/src/main/java/org/woped/bpel/BPEL.java b/WoPeD-BPELExport/src/main/java/org/woped/bpel/BPEL.java index d42bac5ac..aa73abe8a 100644 --- a/WoPeD-BPELExport/src/main/java/org/woped/bpel/BPEL.java +++ b/WoPeD-BPELExport/src/main/java/org/woped/bpel/BPEL.java @@ -21,7 +21,7 @@ import org.woped.core.utilities.Utils; import org.woped.gui.translations.Messages; -// TODO class description +/** Operations with BPEL files. */ public class BPEL { private static BPEL bpelMainClass; @@ -34,21 +34,18 @@ public class BPEL { private FileFilter _filter; private String _fileextension = "bpel"; - // TODO method description public BPEL() { if (BPEL.bpelMainClass != null) return; this.initFilefilter(); bpelMainClass = this; } - // TODO method description private final void initFilefilter() { this._extensions = new Vector(); this._extensions.add(this._fileextension); this._filter = new FileFilterImpl(FileFilterImpl.BPELFilter, "BPEL (*.bpel)", this._extensions); } - // TODO method description public static final BPEL getBPELMainClass() { if (bpelMainClass == null) { new BPEL(); @@ -56,17 +53,14 @@ public static final BPEL getBPELMainClass() { return bpelMainClass; } - // TODO method description public FileFilter getFilefilter() { return this._filter; } - // TODO method description public boolean checkFileExtension(JFileChooser jfc) { return ((FileFilterImpl) jfc.getFileFilter()).getFilterType() == FileFilterImpl.BPELFilter; } - // TODO method description public String getSavePath(String basicPath, JFileChooser jfc) { return basicPath + Utils.getQualifiedFileName(jfc.getSelectedFile().getName(), this._extensions); @@ -81,16 +75,11 @@ public boolean saveFile(String Path, IEditor editor) { m.createModel(pnp.getElementContainer()); ProcessDocument doc = ProcessDocument.Factory.newInstance(); TProcess process = doc.addNewProcess(); - // BPEL.genBpelProcess(); - // BPEL.Process.set(m.generate_bpel()); - // setGlobals(BPEL.Process, pnp); process.set(m.generate_bpel()); setGlobals(process, pnp); // File Output XmlOptions opt = new XmlOptions(); - // opt.setSavePrettyPrintIndent(2); - // opt.setUseDefaultNamespace(); Map map = new HashMap(); map.put("http://docs.oasis-open.org/wsbpel/2.0/process/executable", "bpel"); map.put("http://www.w3.org/2001/XMLSchema", "xs"); @@ -98,7 +87,6 @@ public boolean saveFile(String Path, IEditor editor) { opt.setSavePrettyPrint(); try { doc.save(new File(Path), opt); - // bpelDoc.save(new File(Path), opt); return true; } catch (IOException e) { return false; @@ -128,8 +116,6 @@ public String genPreview(IEditor editor) { return "" + Messages.getString("BPEL.genPreview.Error"); } XmlOptions opt = new XmlOptions(); - // opt.setSavePrettyPrintIndent(2); - // opt.setUseDefaultNamespace(); Map map = new HashMap(); map.put("http://docs.oasis-open.org/wsbpel/2.0/process/executable", "bpel"); map.put("http://www.w3.org/2001/XMLSchema", "xs"); @@ -139,7 +125,6 @@ public String genPreview(IEditor editor) { } public static TProcess genBpelProcess() { - // if(BPEL.Process != null)return BPEL.Process; XmlOptions opt = new XmlOptions(); opt.setUseDefaultNamespace(); opt.setSavePrettyPrint(); diff --git a/WoPeD-Configuration/src/main/java/org/woped/config/WoPeDConfiguration.java b/WoPeD-Configuration/src/main/java/org/woped/config/WoPeDConfiguration.java index 537606a00..b9d488e18 100644 --- a/WoPeD-Configuration/src/main/java/org/woped/config/WoPeDConfiguration.java +++ b/WoPeD-Configuration/src/main/java/org/woped/config/WoPeDConfiguration.java @@ -122,8 +122,6 @@ public String getAppdir() { public abstract boolean readConfig(InputStream is); /** - * TODO: DOCUMENTATION (silenco) - * * @param file * @param configType type indicator for type of currently handled configuration * @return @@ -131,8 +129,6 @@ public String getAppdir() { public abstract boolean readConfig(File file); /** - * TODO: DOCUMENTATION (silenco) - * * @param confDoc * @return */ diff --git a/WoPeD-Configuration/src/main/java/org/woped/config/general/WoPeDGeneralConfiguration.java b/WoPeD-Configuration/src/main/java/org/woped/config/general/WoPeDGeneralConfiguration.java index 4481fffa1..be4155f94 100644 --- a/WoPeD-Configuration/src/main/java/org/woped/config/general/WoPeDGeneralConfiguration.java +++ b/WoPeD-Configuration/src/main/java/org/woped/config/general/WoPeDGeneralConfiguration.java @@ -91,8 +91,6 @@ public boolean initConfig() { } /** - * TODO: DOCUMENTATION (silenco) - * * @return indicates whether loading was successful */ public boolean readConfig() { @@ -160,8 +158,6 @@ public boolean readConfig(InputStream is) { } /** - * TODO: DOCUMENTATION (silenco) - * * @param file * @return */ @@ -188,8 +184,6 @@ public boolean readConfig(File file) { } /** - * TODO: DOCUMENTATION (silenco) - * * @param configDoc * @return */ @@ -285,8 +279,6 @@ public boolean readConfig(XmlObject configDoc) { } /** - * TODO: DOCUMENTATION (silenco) - * * @param file * @return */ diff --git a/WoPeD-Core/src/main/java/org/woped/core/Constants.java b/WoPeD-Core/src/main/java/org/woped/core/Constants.java deleted file mode 100644 index fbdadcd48..000000000 --- a/WoPeD-Core/src/main/java/org/woped/core/Constants.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.woped.core; - -public class Constants { - - public static final String CORE_LOGGER = "CORE_LOGGER"; -} diff --git a/WoPeD-Core/src/main/java/org/woped/core/WoPeDConstants.java b/WoPeD-Core/src/main/java/org/woped/core/WoPeDConstants.java new file mode 100644 index 000000000..b021b653b --- /dev/null +++ b/WoPeD-Core/src/main/java/org/woped/core/WoPeDConstants.java @@ -0,0 +1,11 @@ +package org.woped.core; + +public class WoPeDConstants { + + public static final String CORE_LOGGER = "CORE_LOGGER"; + + // Keep in synch with mvn pom file. + // Could read directly from pom like this: + // https://stackoverflow.com/questions/3697449/retrieve-version-from-maven-pom-xml-in-code + public static final String WOPED_VERSION = "3.9.1"; +} diff --git a/WoPeD-Core/src/main/java/org/woped/core/controller/AbstractApplicationMediator.java b/WoPeD-Core/src/main/java/org/woped/core/controller/AbstractApplicationMediator.java index 5924e3fbc..7d50b9782 100644 --- a/WoPeD-Core/src/main/java/org/woped/core/controller/AbstractApplicationMediator.java +++ b/WoPeD-Core/src/main/java/org/woped/core/controller/AbstractApplicationMediator.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; import javax.swing.UIManager; -import org.woped.core.Constants; +import org.woped.core.WoPeDConstants; import org.woped.core.config.ConfigurationManager; import org.woped.core.config.IGeneralConfiguration; import org.woped.core.gui.IEditorAware; @@ -55,7 +55,7 @@ public AbstractApplicationMediator(IUserInterface ui, IGeneralConfiguration conf viewControllerMap = new HashMap(); boolean confOK = true; - LoggerManager.info(Constants.CORE_LOGGER, "START INIT Application"); + LoggerManager.info(WoPeDConstants.CORE_LOGGER, "START INIT Application"); setUi(ui); setConf(conf); @@ -64,8 +64,8 @@ public AbstractApplicationMediator(IUserInterface ui, IGeneralConfiguration conf confOK = conf.initConfig(); if (!confOK) { // This should NEVER happen! - LoggerManager.fatal(Constants.CORE_LOGGER, "Could really not load any configuration."); - LoggerManager.info(Constants.CORE_LOGGER, "EXIT WoPeD - LOGGING DEACTIVATED"); + LoggerManager.fatal(WoPeDConstants.CORE_LOGGER, "Could really not load any configuration."); + LoggerManager.info(WoPeDConstants.CORE_LOGGER, "EXIT WoPeD - LOGGING DEACTIVATED"); System.exit(0); } } @@ -79,9 +79,9 @@ public AbstractApplicationMediator(IUserInterface ui, IGeneralConfiguration conf UIManager.setLookAndFeel(ConfigurationManager.getConfiguration().getLookAndFeel()); LoggerManager.info( - Constants.CORE_LOGGER, "Look-And-Feel set to " + Platform.getSystemLookAndFeel()); + WoPeDConstants.CORE_LOGGER, "Look-And-Feel set to " + Platform.getSystemLookAndFeel()); } catch (Exception e) { - LoggerManager.debug(Constants.CORE_LOGGER, "Look-And-Feel could not be set"); + LoggerManager.debug(WoPeDConstants.CORE_LOGGER, "Look-And-Feel could not be set"); } } @@ -118,7 +118,7 @@ public static IViewController createViewController(String className, String id) return vc; } catch (Exception e1) { LoggerManager.error( - Constants.CORE_LOGGER, + WoPeDConstants.CORE_LOGGER, "Could not create the ViewController (ID:" + id + ")" + e1.getMessage()); return null; } diff --git a/WoPeD-Core/src/main/java/org/woped/core/controller/AbstractGraph.java b/WoPeD-Core/src/main/java/org/woped/core/controller/AbstractGraph.java index 95174b8b6..db7f5e3d0 100644 --- a/WoPeD-Core/src/main/java/org/woped/core/controller/AbstractGraph.java +++ b/WoPeD-Core/src/main/java/org/woped/core/controller/AbstractGraph.java @@ -40,7 +40,7 @@ import org.jgraph.graph.GraphModel; import org.jgraph.graph.GraphUndoManager; import org.jgraph.graph.Port; -import org.woped.core.Constants; +import org.woped.core.WoPeDConstants; import org.woped.core.config.ConfigurationManager; import org.woped.core.model.PetriNetModelProcessor; import org.woped.core.model.petrinet.AbstractPetriNetElementModel; @@ -204,7 +204,7 @@ public void connect(DefaultEdge edge, boolean insertIntoCache) { } // } else { - LoggerManager.warn(Constants.CORE_LOGGER, "Not a valid connection, did nothing!"); + LoggerManager.warn(WoPeDConstants.CORE_LOGGER, "Not a valid connection, did nothing!"); } } @@ -241,7 +241,7 @@ public GroupModel group( if (mainElement != null && name != null) { // Create Group Cell GroupModel group = new GroupModel(mainElement, name, additional, ungroupable); - LoggerManager.debug(Constants.CORE_LOGGER, "Grouping of Elements created."); + LoggerManager.debug(WoPeDConstants.CORE_LOGGER, "Grouping of Elements created."); return group; } else { GroupModel group = new GroupModel(mainElement, name, additional, ungroupable); @@ -283,7 +283,7 @@ public void ungroup(Object[] cells) { graphModel.remove(groups.toArray()); // Select Children setSelectionCells(children.toArray()); - LoggerManager.debug(Constants.CORE_LOGGER, "Grouping of Elements deleted. "); + LoggerManager.debug(WoPeDConstants.CORE_LOGGER, "Grouping of Elements deleted. "); } } } diff --git a/WoPeD-Core/src/main/java/org/woped/core/controller/LayoutCache.java b/WoPeD-Core/src/main/java/org/woped/core/controller/LayoutCache.java index 532184df7..cc30a8992 100644 --- a/WoPeD-Core/src/main/java/org/woped/core/controller/LayoutCache.java +++ b/WoPeD-Core/src/main/java/org/woped/core/controller/LayoutCache.java @@ -26,7 +26,7 @@ import org.jgraph.graph.CellView; import org.jgraph.graph.GraphLayoutCache; import org.jgraph.graph.GraphModel; -import org.woped.core.Constants; +import org.woped.core.WoPeDConstants; import org.woped.core.utilities.LoggerManager; /** @@ -89,14 +89,14 @@ public void valueForCellChanged(Object cell, Object newValue) { if (cell instanceof DefaultMutableTreeNode) { if (((DefaultMutableTreeNode) cell).getUserObject() == null) { if (newValue == null) { - LoggerManager.debug(Constants.CORE_LOGGER, "Edit not added: No change."); + LoggerManager.debug(WoPeDConstants.CORE_LOGGER, "Edit not added: No change."); } else { super.valueForCellChanged(cell, newValue); } } else if (!((DefaultMutableTreeNode) cell).getUserObject().equals(newValue)) { super.valueForCellChanged(cell, newValue); } else { - LoggerManager.debug(Constants.CORE_LOGGER, "Edit not added: No change."); + LoggerManager.debug(WoPeDConstants.CORE_LOGGER, "Edit not added: No change."); } } else { super.valueForCellChanged(cell, newValue); diff --git a/WoPeD-Core/src/main/java/org/woped/core/controller/VEPController.java b/WoPeD-Core/src/main/java/org/woped/core/controller/VEPController.java index fcf6c367c..db58461b9 100644 --- a/WoPeD-Core/src/main/java/org/woped/core/controller/VEPController.java +++ b/WoPeD-Core/src/main/java/org/woped/core/controller/VEPController.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.Map; -import org.woped.core.Constants; +import org.woped.core.WoPeDConstants; import org.woped.core.utilities.LoggerManager; /** @@ -52,7 +52,7 @@ public void unregister(int viewEventType, AbstractEventProcessor vep) { if (processors == null || !processors.contains(vep)) { LoggerManager.warn( - Constants.CORE_LOGGER, + WoPeDConstants.CORE_LOGGER, "Tried to unregister a AbstractViewEventProcessor which has not" + " registered for this type."); return; diff --git a/WoPeD-Core/src/main/java/org/woped/core/model/ArcModel.java b/WoPeD-Core/src/main/java/org/woped/core/model/ArcModel.java index aac5fc78a..f6c1f30b4 100644 --- a/WoPeD-Core/src/main/java/org/woped/core/model/ArcModel.java +++ b/WoPeD-Core/src/main/java/org/woped/core/model/ArcModel.java @@ -34,7 +34,7 @@ import org.jgraph.graph.DefaultPort; import org.jgraph.graph.GraphConstants; import org.jgraph.graph.PortView; -import org.woped.core.Constants; +import org.woped.core.WoPeDConstants; import org.woped.core.config.ConfigurationManager; import org.woped.core.config.DefaultStaticConfiguration; import org.woped.core.model.petrinet.AbstractPetriNetElementModel; @@ -287,7 +287,7 @@ public void addPoint(Point2D c, int index) { HashMap map = new HashMap(); GraphConstants.setPoints(map, points); getAttributes().applyMap(map); - LoggerManager.debug(Constants.CORE_LOGGER, "Point added " + c.toString()); + LoggerManager.debug(WoPeDConstants.CORE_LOGGER, "Point added " + c.toString()); } /** @@ -369,7 +369,7 @@ public void removePoint(Point2D l) { points.remove(pos); GraphConstants.setPoints(map, points); getAttributes().applyMap(map); - LoggerManager.debug(Constants.CORE_LOGGER, "Point removed"); + LoggerManager.debug(WoPeDConstants.CORE_LOGGER, "Point removed"); } public boolean hasPoint(Point2D p, int tolerance) { diff --git a/WoPeD-Core/src/main/java/org/woped/core/model/CreationMap.java b/WoPeD-Core/src/main/java/org/woped/core/model/CreationMap.java index 974da638b..66d533590 100644 --- a/WoPeD-Core/src/main/java/org/woped/core/model/CreationMap.java +++ b/WoPeD-Core/src/main/java/org/woped/core/model/CreationMap.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Vector; import javax.swing.ImageIcon; -import org.woped.core.Constants; +import org.woped.core.WoPeDConstants; import org.woped.core.config.ConfigurationManager; import org.woped.core.model.petrinet.AbstractPetriNetElementModel; import org.woped.core.utilities.LoggerManager; @@ -387,7 +387,8 @@ public void setArcPoints(List points) { newPoints.add(new Point2D.Double(p.getX1(), p.getX2())); } else { LoggerManager.error( - Constants.CORE_LOGGER, "Could not convert " + o.toString() + "to Point2D. Skipped"); + WoPeDConstants.CORE_LOGGER, + "Could not convert " + o.toString() + "to Point2D. Skipped"); } } diff --git a/WoPeD-Core/src/main/java/org/woped/core/model/ModelElementContainer.java b/WoPeD-Core/src/main/java/org/woped/core/model/ModelElementContainer.java index b1826c2bd..ca211e337 100644 --- a/WoPeD-Core/src/main/java/org/woped/core/model/ModelElementContainer.java +++ b/WoPeD-Core/src/main/java/org/woped/core/model/ModelElementContainer.java @@ -36,7 +36,7 @@ import org.oasisOpen.docs.wsbpel.x20.process.executable.TPartnerLinks; import org.oasisOpen.docs.wsbpel.x20.process.executable.TVariable; import org.oasisOpen.docs.wsbpel.x20.process.executable.TVariables; -import org.woped.core.Constants; +import org.woped.core.WoPeDConstants; import org.woped.core.model.bpel.BpelVariable; import org.woped.core.model.bpel.BpelVariableList; import org.woped.core.model.bpel.PartnerlinkList; @@ -140,11 +140,11 @@ public AbstractPetriNetElementModel addElement(AbstractPetriNetElementModel elem element.addOwningContainer(this); LoggerManager.debug( - Constants.CORE_LOGGER, String.format("Element: %s added", element.getId())); + WoPeDConstants.CORE_LOGGER, String.format("Element: %s added", element.getId())); } else { // an element with the id of the new element already exists - LoggerManager.debug(Constants.CORE_LOGGER, "The Element already exists, did nothing!"); + LoggerManager.debug(WoPeDConstants.CORE_LOGGER, "The Element already exists, did nothing!"); } return element; @@ -163,20 +163,21 @@ public void addReference(ArcModel arc) { // validate source if (getElementById(arc.getSourceId()) == null) { LoggerManager.warn( - Constants.CORE_LOGGER, String.format("Source (ID: %s) doesn't exist", arc.getSourceId())); + WoPeDConstants.CORE_LOGGER, + String.format("Source (ID: %s) doesn't exist", arc.getSourceId())); return; } // validate target if (getElementById(arc.getTargetId()) == null) { LoggerManager.warn( - Constants.CORE_LOGGER, "Target (ID:" + arc.getTargetId() + ") does not exist"); + WoPeDConstants.CORE_LOGGER, "Target (ID:" + arc.getTargetId() + ") does not exist"); return; } // Check if reference already exists if (hasReference(arc.getSourceId(), arc.getTargetId())) { - LoggerManager.debug(Constants.CORE_LOGGER, "Arc already exists!"); + LoggerManager.debug(WoPeDConstants.CORE_LOGGER, "Arc already exists!"); return; } @@ -184,7 +185,7 @@ public void addReference(ArcModel arc) { getIdMap().get(arc.getSourceId()).put(arc.getId(), arc); arcs.put(arc.getId(), arc); LoggerManager.debug( - Constants.CORE_LOGGER, + WoPeDConstants.CORE_LOGGER, "Reference: " + arc.getId() + " (" @@ -233,7 +234,7 @@ public void removeOnlyElement(Object id) { // The element is no longer owned by anybody if (element != null) element.removeOwningContainer(this); getIdMap().remove(id); - LoggerManager.debug(Constants.CORE_LOGGER, "Element (ID:" + id + ") removed."); + LoggerManager.debug(WoPeDConstants.CORE_LOGGER, "Element (ID:" + id + ") removed."); } /** @@ -246,7 +247,8 @@ public void removeArcsFromElement(Object id) { removeIncomingArcsFromElement(id); removeOutgoingArcsFromElement(id); - LoggerManager.debug(Constants.CORE_LOGGER, "All References from/to (ID:" + id + ") deleted"); + LoggerManager.debug( + WoPeDConstants.CORE_LOGGER, "All References from/to (ID:" + id + ") deleted"); } /** @@ -283,7 +285,7 @@ public void removeArc(Object id) { ArcModel arc = getArcById(id); if (arc == null) { - LoggerManager.warn(Constants.CORE_LOGGER, "Arc with ID: " + id + " does not exists"); + LoggerManager.warn(WoPeDConstants.CORE_LOGGER, "Arc with ID: " + id + " does not exists"); } removeArc(arc); @@ -296,7 +298,7 @@ public void removeArc(Object id) { */ public void removeArc(ArcModel arc) { if (arc != null) { - LoggerManager.debug(Constants.CORE_LOGGER, "Reference (ID:" + arc.getId() + ") deleted"); + LoggerManager.debug(WoPeDConstants.CORE_LOGGER, "Reference (ID:" + arc.getId() + ") deleted"); // remove in arc Map arcs.remove(arc.getId()); // remove Target Entry, (in Source Element's reference Map) @@ -450,7 +452,7 @@ public AbstractPetriNetElementModel getElementById(Object id) { } else { LoggerManager.debug( - Constants.CORE_LOGGER, "Requested Element (ID:" + id + ") does not exists"); + WoPeDConstants.CORE_LOGGER, "Requested Element (ID:" + id + ") does not exists"); return null; } } @@ -477,7 +479,8 @@ public ArcModel getArcById(Object id) { if (arcs.get(id) != null) { return arcs.get(id); } else { - LoggerManager.debug(Constants.CORE_LOGGER, " Requested Arc (ID:" + id + ") does not exists"); + LoggerManager.debug( + WoPeDConstants.CORE_LOGGER, " Requested Arc (ID:" + id + ") does not exists"); return null; } } diff --git a/WoPeD-Core/src/main/java/org/woped/core/model/ModelElementFactory.java b/WoPeD-Core/src/main/java/org/woped/core/model/ModelElementFactory.java index c5002ecd2..1b5332e36 100644 --- a/WoPeD-Core/src/main/java/org/woped/core/model/ModelElementFactory.java +++ b/WoPeD-Core/src/main/java/org/woped/core/model/ModelElementFactory.java @@ -23,7 +23,7 @@ package org.woped.core.model; import org.jgraph.graph.DefaultPort; -import org.woped.core.Constants; +import org.woped.core.WoPeDConstants; import org.woped.core.model.petrinet.ANDJoinOperatorTransitionModel; import org.woped.core.model.petrinet.ANDJoinXORSplitOperatorTransitionModel; import org.woped.core.model.petrinet.ANDSplitJoinOperatorTransitionModel; @@ -102,7 +102,8 @@ public static AbstractPetriNetElementModel createModelElement(CreationMap map) { break; default: LoggerManager.error( - Constants.CORE_LOGGER, "Unknown Operator Type (" + map.getOperatorType() + ")"); + WoPeDConstants.CORE_LOGGER, + "Unknown Operator Type (" + map.getOperatorType() + ")"); } // modElement.setId(id); // create inital simple trans @@ -119,13 +120,13 @@ public static AbstractPetriNetElementModel createModelElement(CreationMap map) { } catch (Exception ee) { LoggerManager.error( - Constants.CORE_LOGGER, + WoPeDConstants.CORE_LOGGER, "Could not create model! Type not supported (" + map.getType() + ")"); ee.printStackTrace(); return null; } } else { - LoggerManager.error(Constants.CORE_LOGGER, "ID must be set"); + LoggerManager.error(WoPeDConstants.CORE_LOGGER, "ID must be set"); return null; } } @@ -139,7 +140,7 @@ public static ArcModel createArcModel(String arcId, DefaultPort source, DefaultP arc.setTarget(target); return arc; } else { - LoggerManager.error(Constants.CORE_LOGGER, "ID must be set"); + LoggerManager.error(WoPeDConstants.CORE_LOGGER, "ID must be set"); return null; } } diff --git a/WoPeD-Core/src/main/java/org/woped/core/model/PetriNetModelProcessor.java b/WoPeD-Core/src/main/java/org/woped/core/model/PetriNetModelProcessor.java index 87f4655fb..bf11f02b2 100644 --- a/WoPeD-Core/src/main/java/org/woped/core/model/PetriNetModelProcessor.java +++ b/WoPeD-Core/src/main/java/org/woped/core/model/PetriNetModelProcessor.java @@ -32,7 +32,7 @@ import java.util.Set; import java.util.Vector; import org.jgraph.graph.DefaultPort; -import org.woped.core.Constants; +import org.woped.core.WoPeDConstants; import org.woped.core.model.petrinet.AbstractPetriNetElementModel; import org.woped.core.model.petrinet.OperatorTransitionModel; import org.woped.core.model.petrinet.PlaceModel; @@ -228,20 +228,20 @@ private void resolveInnerConnections( operatorModel.addElement(getElementContainer().getElementById(targetModel.getId())); LoggerManager.debug( - Constants.CORE_LOGGER, + WoPeDConstants.CORE_LOGGER, "Connection from Aalst Model detected... resolve Inner-Transitions ..."); // Register new outgoing connection with the operator. // This will generate all the necessary inner arcs operatorModel.registerOutgoingConnection(this, targetModel); - LoggerManager.debug(Constants.CORE_LOGGER, "... Inner-Transition resolving completed"); + LoggerManager.debug(WoPeDConstants.CORE_LOGGER, "... Inner-Transition resolving completed"); } /* IF OPERATOR IS TARGET */ else if (targetModel.getType() == AbstractPetriNetElementModel.TRANS_OPERATOR_TYPE) { LoggerManager.debug( - Constants.CORE_LOGGER, + WoPeDConstants.CORE_LOGGER, "Connection to Aalst Model detected... resolve Inner-Transitions ..."); // store the target as operatorModel operatorModel = @@ -254,7 +254,7 @@ else if (targetModel.getType() == AbstractPetriNetElementModel.TRANS_OPERATOR_TY // This will generate all the necessary inner arcs operatorModel.registerIncomingConnection(this, sourceModel); - LoggerManager.debug(Constants.CORE_LOGGER, "... Inner-Transition resolving completed"); + LoggerManager.debug(WoPeDConstants.CORE_LOGGER, "... Inner-Transition resolving completed"); } } @@ -305,7 +305,7 @@ public void removeArc(Object arcId) { // We have to remove this local copy currentOperator.getSimpleTransContainer().removeElement(sourceElement.getId()); - LoggerManager.debug(Constants.CORE_LOGGER, "INNER ARC TO SOURCE deleted"); + LoggerManager.debug(WoPeDConstants.CORE_LOGGER, "INNER ARC TO SOURCE deleted"); } // remove element from the subprocess model @@ -398,11 +398,11 @@ public void addResourceMapping(String resourceClass, String resourceId) { getResourceMapping().get(resourceClass).add(resourceId); } } else { - LoggerManager.warn(Constants.CORE_LOGGER, "resource doesn't exist"); + LoggerManager.warn(WoPeDConstants.CORE_LOGGER, "resource doesn't exist"); } } else { - LoggerManager.warn(Constants.CORE_LOGGER, "role or orgUnit doesn't exist"); + LoggerManager.warn(WoPeDConstants.CORE_LOGGER, "role or orgUnit doesn't exist"); } } diff --git a/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/AbstractPetriNetElementModel.java b/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/AbstractPetriNetElementModel.java index 823f0c371..059048c65 100644 --- a/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/AbstractPetriNetElementModel.java +++ b/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/AbstractPetriNetElementModel.java @@ -16,7 +16,7 @@ import org.jgraph.graph.DefaultGraphCell; import org.jgraph.graph.DefaultPort; import org.jgraph.graph.GraphConstants; -import org.woped.core.Constants; +import org.woped.core.WoPeDConstants; import org.woped.core.model.CreationMap; import org.woped.core.model.ElementContext; import org.woped.core.model.IntPair; @@ -121,7 +121,7 @@ public AbstractPetriNetElementModel(CreationMap creationMap, Object userObject) if (creationMap.getBpeldata() != null) this.BpelData = creationMap.getBpeldata(); } else { LoggerManager.error( - Constants.CORE_LOGGER, + WoPeDConstants.CORE_LOGGER, "It's not allowed to create a Element without id. Please use ModelElementFactory" + " instead."); } diff --git a/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/SubProcessModel.java b/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/SubProcessModel.java index 2fcc67605..d7d526152 100644 --- a/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/SubProcessModel.java +++ b/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/SubProcessModel.java @@ -26,7 +26,7 @@ import java.util.Map; import org.jgraph.graph.DefaultPort; import org.jgraph.graph.Edge; -import org.woped.core.Constants; +import org.woped.core.WoPeDConstants; import org.woped.core.model.CreationMap; import org.woped.core.model.ModelElementContainer; import org.woped.core.model.ModelElementFactory; @@ -73,7 +73,7 @@ public SubProcessModel(CreationMap map) { private ModelElementContainer copySubElementContainer(ModelElementContainer container) { - LoggerManager.info(Constants.CORE_LOGGER, "copySubElementContainer"); + LoggerManager.info(WoPeDConstants.CORE_LOGGER, "copySubElementContainer"); ModelElementContainer newContainer = new ModelElementContainer(); newContainer.setOwningElement(container.getOwningElement()); diff --git a/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/Toolspecific.java b/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/Toolspecific.java index 15eebb0e7..7c124fdc6 100644 --- a/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/Toolspecific.java +++ b/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/Toolspecific.java @@ -24,7 +24,7 @@ import java.awt.Color; import java.io.Serializable; -import org.woped.core.Constants; +import org.woped.core.WoPeDConstants; import org.woped.core.model.CreationMap; import org.woped.core.utilities.LoggerManager; @@ -128,7 +128,7 @@ public void setOperatorType(int operatorType) { */ public TriggerModel setTrigger(CreationMap map) { this.trigger = new TriggerModel(map); - LoggerManager.debug(Constants.CORE_LOGGER, "Trigger added to " + getOwnerId() + "."); + LoggerManager.debug(WoPeDConstants.CORE_LOGGER, "Trigger added to " + getOwnerId() + "."); return trigger; } @@ -140,7 +140,7 @@ public TriggerModel setTrigger(TriggerModel trigger) { /** TODO: Documentation */ public void removeTrigger() { this.trigger = null; - LoggerManager.debug(Constants.CORE_LOGGER, "Trigger deleted."); + LoggerManager.debug(WoPeDConstants.CORE_LOGGER, "Trigger deleted."); } /** @@ -199,7 +199,7 @@ public TransitionResourceModel getTransResource() { /** TODO: Documentation (waschtl) */ public void removeTransResource() { this.transResource = null; - LoggerManager.debug(Constants.CORE_LOGGER, "ResourceModel deleted."); + LoggerManager.debug(WoPeDConstants.CORE_LOGGER, "ResourceModel deleted."); } /** @@ -212,7 +212,7 @@ public TransitionResourceModel setTransResource(TransitionResourceModel transRes public TransitionResourceModel setTransResource(CreationMap map) { this.transResource = new TransitionResourceModel(map); - LoggerManager.debug(Constants.CORE_LOGGER, "TransResource added to " + getOwnerId() + "."); + LoggerManager.debug(WoPeDConstants.CORE_LOGGER, "TransResource added to " + getOwnerId() + "."); return transResource; } diff --git a/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/XORJoinOperatorTransitionModel.java b/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/XORJoinOperatorTransitionModel.java index feaf8c8ca..66ceb9a6f 100644 --- a/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/XORJoinOperatorTransitionModel.java +++ b/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/XORJoinOperatorTransitionModel.java @@ -2,7 +2,7 @@ import java.util.Iterator; import org.jgraph.graph.DefaultPort; -import org.woped.core.Constants; +import org.woped.core.WoPeDConstants; import org.woped.core.model.CreationMap; import org.woped.core.model.ModelElementContainer; import org.woped.core.model.PetriNetModelProcessor; @@ -87,7 +87,7 @@ public void registerIncomingConnectionRemoval( .size() != 1) { getSimpleTransContainer().removeAllTargetElements(otherModel.getId()); - LoggerManager.debug(Constants.CORE_LOGGER, "INNER Target Elements deleted"); + LoggerManager.debug(WoPeDConstants.CORE_LOGGER, "INNER Target Elements deleted"); } } } diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/controller/ActionFactory.java b/WoPeD-Editor/src/main/java/org/woped/editor/controller/ActionFactory.java index 204f5a42b..47332f50e 100644 --- a/WoPeD-Editor/src/main/java/org/woped/editor/controller/ActionFactory.java +++ b/WoPeD-Editor/src/main/java/org/woped/editor/controller/ActionFactory.java @@ -187,8 +187,6 @@ public static HashMap createStaticActions(ApplicationMediat AbstractViewEvent.SAVEAS, null, ACTIONID_SAVEAS)); - // VisualController.getInstance().addElement(STATIC_ACTION_MAP.get(ACTIONID_SAVEAS), - // VisualController.SUBPROCESS_EDITOR, VisualController.IGNORE, VisualController.IGNORE); VisualController.getInstance() .addElement( STATIC_ACTION_MAP.get(ACTIONID_SAVEAS), diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/utilities/SwingWorker.java b/WoPeD-Editor/src/main/java/org/woped/editor/utilities/SwingWorker.java deleted file mode 100644 index 5953c4359..000000000 --- a/WoPeD-Editor/src/main/java/org/woped/editor/utilities/SwingWorker.java +++ /dev/null @@ -1,132 +0,0 @@ -package org.woped.editor.utilities; - -import javax.swing.JProgressBar; -import javax.swing.SwingUtilities; - -/** - * This is the 3rd version of SwingWorker (also known as SwingWorker 3), an abstract class that you - * subclass to perform GUI-related work in a dedicated thread. For instructions on and examples of - * using this class, see: - * - *

http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html - * - *

Note that the API changed slightly in the 3rd version: You must now invoke start() on the - * SwingWorker after creating it. - */ -public abstract class SwingWorker { - private Object value; // see getValue(), setValue() - - /** - * Class to maintain reference to current worker thread under separate synchronization control. - */ - private static class ThreadVar { - private Thread thread; - - ThreadVar(Thread t) { - thread = t; - } - - synchronized Thread get() { - return thread; - } - - synchronized void clear() { - thread = null; - } - } - - private ThreadVar threadVar; - - /** Get the value produced by the worker thread, or null if it hasn't been constructed yet. */ - protected synchronized Object getValue() { - return value; - } - - /** Set the value produced by worker thread */ - private synchronized void setValue(Object x) { - value = x; - } - - /** Compute the value to be returned by the get method. */ - public abstract Object construct(); - - /** - * Called on the event dispatching thread (not on the worker thread) after the construct - * method has returned. - */ - public void finished() {} - - /** - * A new method that interrupts the worker thread. Call this method to force the worker to stop - * what it's doing. - */ - public void interrupt() { - Thread t = threadVar.get(); - if (t != null) { - t.interrupt(); - } - threadVar.clear(); - } - - private JProgressBar bar; - - /** - * Return the value created by the construct method. Returns null if either the - * constructing thread or the current thread was interrupted before a value was produced. - * - * @return the value created by the construct method - */ - public Object get() { - while (true) { - Thread t = threadVar.get(); - if (t == null) { - return getValue(); - } - try { - t.join(); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); // propagate - return null; - } - } - } - - /** Start a thread that will call the construct method and then exit. */ - public SwingWorker(JProgressBar bar) { - final Runnable doFinished = - new Runnable() { - public void run() { - finished(); - } - }; - - Runnable doConstruct = - new Runnable() { - public void run() { - try { - setValue(construct()); - } finally { - threadVar.clear(); - } - - SwingUtilities.invokeLater(doFinished); - } - }; - - Thread t = new Thread(doConstruct); - threadVar = new ThreadVar(t); - this.bar = bar; - } - - public JProgressBar getBar() { - return bar; - } - - /** Start the worker thread. */ - public void start() { - Thread t = threadVar.get(); - if (t != null) { - t.start(); - } - } -} diff --git a/WoPeD-FileInterface/src/main/java/org/woped/file/PNMLExport.java b/WoPeD-FileInterface/src/main/java/org/woped/file/PNMLExport.java index 7af43caf4..2a4a3bcfb 100644 --- a/WoPeD-FileInterface/src/main/java/org/woped/file/PNMLExport.java +++ b/WoPeD-FileInterface/src/main/java/org/woped/file/PNMLExport.java @@ -32,6 +32,7 @@ import javax.swing.*; import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlOptions; +import org.woped.core.WoPeDConstants; import org.woped.core.config.ConfigurationManager; import org.woped.core.controller.AbstractApplicationMediator; import org.woped.core.controller.IStatusBar; @@ -55,10 +56,12 @@ *

Created on: 13.01.2005 Last Change on: 13.01.2005 */ public class PNMLExport { - private static final String comment = + private static final String COMMENT = "\n" - + "PLEASE DO NOT EDIT THIS FILE\n" - + "Created with Workflow PetriNet Designer Version 3.2.0 (woped.org)\n"; + + "Created with Workflow PetriNet Designer Version " + + WoPeDConstants.WOPED_VERSION + + " (woped.org)\n" + + "Manual editing may break compatibility.\n"; private PnmlDocument pnmlDoc = null; private IStatusBar[] statusBars = null; @@ -94,7 +97,6 @@ public boolean saveToFile(EditorVC editor, String fileName) { opt.setSavePrettyPrintIndent(2); HashMap map = new HashMap(); map.put("", "pnml.woped.org"); - // map.put("", "http://docs.oasis-open.org/wsbpel/2.0/process/executable"); opt.setSaveImplicitNamespaces(map); pnmlDoc.save(new File(fileName), opt); @@ -155,7 +157,7 @@ private void createJavaBeansInstances(EditorVC editor) { int resourcesMapping = petrinetModel.getResourceMapping().size(); int rootElements = elementContainer.getRootElements().size(); int arcs = elementContainer.getArcMap().size(); - // TODO (blackfox) - extend statusbars for simulations + // (blackfox) - Could extend statusbars for simulations for (int i = 0; i < statusBars.length; i++) statusBars[i].startProgress( @@ -164,7 +166,7 @@ private void createJavaBeansInstances(EditorVC editor) { // ------------------------------ // pnmlDoc.documentProperties(); XmlCursor cursor = iPnml.newCursor(); - cursor.insertComment(comment); + cursor.insertComment(COMMENT); /* ##### NET ##### */ NetType iNet = iPnml.addNewNet(); // attr type diff --git a/WoPeD-FileInterface/src/main/java/org/woped/file/WoPeDToYAWL/YAWLExportUtils.java b/WoPeD-FileInterface/src/main/java/org/woped/file/WoPeDToYAWL/YAWLExportUtils.java index 44c11f42d..aad7c644d 100644 --- a/WoPeD-FileInterface/src/main/java/org/woped/file/WoPeDToYAWL/YAWLExportUtils.java +++ b/WoPeD-FileInterface/src/main/java/org/woped/file/WoPeDToYAWL/YAWLExportUtils.java @@ -5,7 +5,7 @@ import java.util.Base64; import java.util.Collection; import java.util.Vector; -import org.woped.core.Constants; +import org.woped.core.WoPeDConstants; import org.woped.core.config.ConfigurationManager; import org.woped.core.model.ArcModel; import org.woped.core.model.ModelElementContainer; @@ -85,7 +85,7 @@ public static synchronized String generateDefaultPassword() { encodedString = Base64.getEncoder().encodeToString(raw); } catch (Exception e) { - LoggerManager.error(Constants.CORE_LOGGER, "Default Password could not be generated!"); + LoggerManager.error(WoPeDConstants.CORE_LOGGER, "Default Password could not be generated!"); } return encodedString; } diff --git a/WoPeD-FileInterface/src/main/java/org/woped/file/controller/vep/FileEventProcessor.java b/WoPeD-FileInterface/src/main/java/org/woped/file/controller/vep/FileEventProcessor.java index ae30f71da..34d3fdfc3 100644 --- a/WoPeD-FileInterface/src/main/java/org/woped/file/controller/vep/FileEventProcessor.java +++ b/WoPeD-FileInterface/src/main/java/org/woped/file/controller/vep/FileEventProcessor.java @@ -7,7 +7,6 @@ import java.io.FileNotFoundException; import java.io.FilenameFilter; import java.io.InputStream; -import java.security.AccessControlException; import java.util.Iterator; import java.util.Map; import java.util.Vector; @@ -204,7 +203,7 @@ public String getExtension() { } /** - * TODO: DOCUMENTATION (silenco) + * Reports model soundness. * * @param editor */ @@ -337,7 +336,8 @@ public void export(EditorVC editor) { 0, jfc.getSelectedFile().getAbsolutePath().length() - jfc.getSelectedFile().getName().length()); - if (((FileFilterImpl) jfc.getFileFilter()).getFilterType() == FileFilterImpl.TPNFilter) { + int filterType = ((FileFilterImpl) jfc.getFileFilter()).getFilterType(); + if (filterType == FileFilterImpl.TPNFilter) { if (containsArcWeights(editor)) { // arc weights not supported in tpn showWarning("QuantAna.Message.TPN.ArcWeightViolation"); @@ -346,16 +346,13 @@ public void export(EditorVC editor) { } savePath = savePath + Utils.getQualifiedFileName(jfc.getSelectedFile().getName(), tpnExtensions); - } else if (((FileFilterImpl) jfc.getFileFilter()).getFilterType() - == FileFilterImpl.JPGFilter) { + } else if (filterType == FileFilterImpl.JPGFilter) { savePath = savePath + Utils.getQualifiedFileName(jfc.getSelectedFile().getName(), jpgExtensions); - } else if (((FileFilterImpl) jfc.getFileFilter()).getFilterType() - == FileFilterImpl.PNGFilter) { + } else if (filterType == FileFilterImpl.PNGFilter) { savePath = savePath + Utils.getQualifiedFileName(jfc.getSelectedFile().getName(), pngExtensions); - } else if (((FileFilterImpl) jfc.getFileFilter()).getFilterType() - == FileFilterImpl.BMPFilter) { + } else if (filterType == FileFilterImpl.BMPFilter) { savePath = savePath + Utils.getQualifiedFileName(jfc.getSelectedFile().getName(), bmpExtensions); } else if (BPEL.getBPELMainClass().checkFileExtension(jfc)) { @@ -365,7 +362,7 @@ public void export(EditorVC editor) { } // ... and saving - editor.setDefaultFileType(((FileFilterImpl) jfc.getFileFilter()).getFilterType()); + editor.setDefaultFileType(filterType); editor.setFilePath(savePath); ConfigurationManager.getConfiguration() .setCurrentWorkingdir(savePath.substring(0, savePath.lastIndexOf(File.separator))); @@ -395,7 +392,7 @@ boolean containsArcWeights(EditorVC editor) { } /** - * TODO: DOCUMENTATION (silenco) + * Save the model. * * @param editor * @return @@ -412,7 +409,6 @@ public boolean save(final EditorVC editor) { Constants.FILE_LOGGER, "File was not saved before. Call \"Save as\" instead."); saveAs(editor); } else { - if (editor.getDefaultFileType() == FileFilterImpl.JPGFilter) { succeed = ImageExport.saveJPG( @@ -433,7 +429,6 @@ else if (editor.getDefaultFileType() == FileFilterImpl.PNMLFilter) { pe.saveToFile(editor, editor.getFilePath()); LoggerManager.info( Constants.FILE_LOGGER, "Petrinet saved in file: " + editor.getFilePath()); - ConfigurationManager.getConfiguration() .addRecentFile(new File(editor.getFilePath()).getName(), editor.getFilePath()); getMediator().getUi().updateRecentMenu(); @@ -506,11 +501,11 @@ else if (editor.getDefaultFileType() == FileFilterImpl.TPNFilter) { } } } - } catch (AccessControlException ace) { + } catch (Exception ace) { ace.printStackTrace(); LoggerManager.warn( Constants.FILE_LOGGER, - "Could not save Editor. No rights to write the file to " + "Could not save Editor. Unable to write the file to " + editor.getFilePath() + ". " + ace.getMessage()); @@ -526,13 +521,7 @@ else if (editor.getDefaultFileType() == FileFilterImpl.TPNFilter) { } /** - * TODO: Documentation - * - * @param editor - * @return - */ - /** - * TODO: Documentation + * Save As operation. * * @param editor * @return @@ -629,7 +618,6 @@ public boolean saveAs(EditorVC editor) { return succeed; } - /** TODO: DOCUMENTATION (silenco) */ private IEditor openEditor() { JFileChooser fileChooser; FileDialog fileDialog; @@ -756,13 +744,6 @@ public IEditor openFile(File file, int filter) { inputStream = this.getClass().getResourceAsStream(jarPath); loadSuccess = pnmlImport.run(inputStream, null); - - /* - * if (!loadSuccess) - * LoggerManager.error(Constants.FILE_LOGGER, - * "Could not open InputStream. " + file.getAbsolutePath()); - */ - // } } break; default: @@ -785,9 +766,6 @@ public IEditor openFile(File file, int filter) { ConfigurationManager.getConfiguration() .setCurrentWorkingdir(abspath.substring(0, abspath.lastIndexOf(File.separator))); } - if (filter != FileFilterImpl.SAMPLEFilter) { - // ConfigurationManager.getConfiguration().setCurrentWorkingdir(abspath.substring(0,abspath.lastIndexOf(File.separator))); - } // add Editor LoggerManager.info( Constants.FILE_LOGGER, "Petrinet loaded from file: " + file.getAbsolutePath()); diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/p2t/PNMLExport.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/p2t/PNMLExport.java index 88847485c..88edc1a53 100644 --- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/p2t/PNMLExport.java +++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/p2t/PNMLExport.java @@ -31,6 +31,7 @@ import javax.swing.*; import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlOptions; +import org.woped.core.WoPeDConstants; import org.woped.core.config.ConfigurationManager; import org.woped.core.controller.IEditor; import org.woped.core.model.ArcModel; @@ -43,7 +44,8 @@ import org.woped.pnml.NetType.Page; import org.woped.pnml.TextType.Phrase; -// TODO: Nur kopiert aus FileInterface und geringfügig angepasst +// Nur kopiert aus FileInterface und geringfügig angepasst +// (Copy-paste fork of org.woped.file.PNMLExport. Best to merge. /** * @author Simon Landes
@@ -51,10 +53,12 @@ *

Created on: 13.01.2005 Last Change on: 13.01.2005 */ public class PNMLExport { - private static final String comment = + private static final String COMMENT = "\n" - + "PLEASE DO NOT EDIT THIS FILE\n" - + "Created with Workflow PetriNet Designer Version 3.2.0 (woped.org)\n"; + + "Created with Workflow PetriNet Designer Version " + + WoPeDConstants.WOPED_VERSION + + " (woped.org)\n" + + "Manual editing may break compatibility.\n"; private PnmlDocument pnmlDoc = null; /** @@ -94,7 +98,7 @@ private void createJavaBeansInstances(IEditor editor) { // ------------------------------ // pnmlDoc.documentProperties(); XmlCursor cursor = iPnml.newCursor(); - cursor.insertComment(comment); + cursor.insertComment(COMMENT); /* ##### NET ##### */ NetType iNet = iPnml.addNewNet(); // attr type diff --git a/WoPeD-QuantAnalysis/src/main/java/org/woped/quantana/gui/QuantitativeSimulationDialog.java b/WoPeD-QuantAnalysis/src/main/java/org/woped/quantana/gui/QuantitativeSimulationDialog.java index 8e738dfb6..7c1c4130e 100644 --- a/WoPeD-QuantAnalysis/src/main/java/org/woped/quantana/gui/QuantitativeSimulationDialog.java +++ b/WoPeD-QuantAnalysis/src/main/java/org/woped/quantana/gui/QuantitativeSimulationDialog.java @@ -213,7 +213,7 @@ public class QuantitativeSimulationDialog extends JDialog Messages.getString("QuantAna.Simulation.ToolTip.W"), Messages.getString("QuantAna.Simulation.ToolTip.Ws"), Messages.getString("QuantAna.Simulation.ToolTip.Wq"), - Messages.getString("QuantAna.Simulation.TooTip.Details") + Messages.getString("QuantAna.Simulation.ToolTip.Details") }; private String[] colResUtil = { diff --git a/WoPeD-Starter/src/main/java/org/woped/starter/DefaultUserInterface.java b/WoPeD-Starter/src/main/java/org/woped/starter/DefaultUserInterface.java index 95645c871..da8393586 100644 --- a/WoPeD-Starter/src/main/java/org/woped/starter/DefaultUserInterface.java +++ b/WoPeD-Starter/src/main/java/org/woped/starter/DefaultUserInterface.java @@ -59,11 +59,6 @@ public class DefaultUserInterface extends MainFrame public DefaultUserInterface(TaskBarVC taskBar, StatusBarVC statusBar) { super(); - /* Programmable fullscreen support no more supported in Java 9+ - if ( Platform.isMac() ) { - final Window currentWindow = (Window) SwingUtilities.getRoot(this); - OSXFullscreen.enableOSXFullscreen(currentWindow); - }*/ // Adaption of constructor signature this.statusBar = statusBar; diff --git a/WoPeD-Starter/src/main/java/org/woped/starter/MainFrame.java b/WoPeD-Starter/src/main/java/org/woped/starter/MainFrame.java index 3e6b5d0db..369372abb 100644 --- a/WoPeD-Starter/src/main/java/org/woped/starter/MainFrame.java +++ b/WoPeD-Starter/src/main/java/org/woped/starter/MainFrame.java @@ -751,14 +751,12 @@ private void setTooltip(JCommandButton button, String prefix, Boolean usesShortc } else { shortcut += KeyEvent.getKeyText(shortcutKS.getKeyCode()); RichTooltip rt = getTooltip(prefix); - // rt.addFooterSection(shortcut); //Alternative display of Shortcut rt.setTitle(rt.getTitle() + " (" + shortcut + ")"); button.setActionRichTooltip(rt); } } catch (NullPointerException nex) { RichTooltip rt = getTooltip(prefix); - // rt.addFooterSection(shortcut); //Alternative display of Shortcut button.setActionRichTooltip(rt); } catch (Exception ex) { } @@ -2009,9 +2007,6 @@ private JCommandButton getP2TButton() { p2tButton.addActionListener( new ActionButtonListener( m_mediator, ActionFactory.ACTIONID_P2T, AbstractViewEvent.P2T, p2tButton)); - // TODO(optional): - // addShortcutToJCommandButton("Metrics.processmetrics", processMetricsButton, - // ActionFactory.ACTIONID_METRIC); setTooltip(p2tButton, "P2T"); } @@ -2024,9 +2019,6 @@ private JCommandButton getT2PButton() { t2pButton.addActionListener( new ActionButtonListener( m_mediator, ActionFactory.ACTIONID_T2P, AbstractViewEvent.T2P, t2pButton)); - // TODO(optional): - // addShortcutToJCommandButton("Metrics.processmetrics", processMetricsButton, - // ActionFactory.ACTIONID_METRIC); setTooltip(t2pButton, "T2P"); } @@ -2738,51 +2730,51 @@ public void setMediator(AbstractApplicationMediator mediator) { @Override public void arrangeFrames() { - // TODO Auto-generated method stub + // Deliberately empty } @Override public void cascadeFrames() { - // TODO Auto-generated method stub + // Deliberately empty } @Override public List getAllEditors() { - // TODO Auto-generated method stub + // Deliberately empty return null; } @Override public Component getComponent() { - // TODO Auto-generated method stub + // Deliberately empty return null; } @Override public IEditor getEditorFocus() { - // TODO Auto-generated method stub + // Deliberately empty return null; } @Override public Component getPropertyChangeSupportBean() { - // TODO Auto-generated method stub + // Deliberately empty return null; } @Override public void hideEditor(IEditor editor) { - // TODO Auto-generated method stub + // Deliberately empty } @Override public void quit() { - // TODO Auto-generated method stub + // Deliberately empty } @Override public void refreshFocusOnFrames() { - // TODO Auto-generated method stub + // Deliberately empty } @Override @@ -2804,7 +2796,7 @@ public void removeEditor(IEditor editor) { @Override public void renameEditor(IEditor editor) { - // TODO Auto-generated method stub + // Deliberately empty } @Override @@ -2812,13 +2804,13 @@ public void selectEditor(IEditor editor) {} @Override public boolean isMaximized() { - // TODO Auto-generated method stub + // Deliberately empty return false; } @Override public void updateRecentMenu() { - // TODO Auto-generated method stub + // Deliberately empty } class recentFileListener implements ActionListener { diff --git a/WoPeD-Starter/src/main/java/org/woped/starter/RunWoPeD.java b/WoPeD-Starter/src/main/java/org/woped/starter/RunWoPeD.java index cae1fd5b6..7f10781c3 100644 --- a/WoPeD-Starter/src/main/java/org/woped/starter/RunWoPeD.java +++ b/WoPeD-Starter/src/main/java/org/woped/starter/RunWoPeD.java @@ -179,8 +179,9 @@ private void initLogging() { org.apache.log4j.Logger.getLogger(org.woped.config.Constants.CONFIG_LOGGER)), org.woped.config.Constants.CONFIG_LOGGER); LoggerManager.register( - new WopedLogger(org.apache.log4j.Logger.getLogger(org.woped.core.Constants.CORE_LOGGER)), - org.woped.core.Constants.CORE_LOGGER); + new WopedLogger( + org.apache.log4j.Logger.getLogger(org.woped.core.WoPeDConstants.CORE_LOGGER)), + org.woped.core.WoPeDConstants.CORE_LOGGER); LoggerManager.register( new WopedLogger( org.apache.log4j.Logger.getLogger(org.woped.quantana.Constants.QUANTANA_LOGGER)), @@ -250,7 +251,7 @@ private boolean setupHasFinished() { Process p; if (Platform.isMac()) { - p = Runtime.getRuntime().exec("ps -e"); + p = Runtime.getRuntime().exec(new String[] {"ps", "-e"}); pattern = "Installer"; BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream())); while ((line = input.readLine()) != null) { diff --git a/WoPeD-Starter/src/main/java/org/woped/starter/utilities/WopedLogger.java b/WoPeD-Starter/src/main/java/org/woped/starter/utilities/WopedLogger.java index 12312d049..000382dc5 100644 --- a/WoPeD-Starter/src/main/java/org/woped/starter/utilities/WopedLogger.java +++ b/WoPeD-Starter/src/main/java/org/woped/starter/utilities/WopedLogger.java @@ -1,8 +1,6 @@ /* * Created on 28.10.2005 * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates */ package org.woped.starter.utilities; @@ -11,8 +9,6 @@ /** * @author lai - *

TODO To change the template for this generated type comment go to Window - Preferences - - * Java - Code Style - Code Templates */ public class WopedLogger implements ILogger { diff --git a/WoPeD-UnitTests/src/test/java/org/woped/core/controller/VEPControllerTest.java b/WoPeD-UnitTests/src/test/java/org/woped/core/controller/VEPControllerTest.java index 2c9177629..faa71071f 100644 --- a/WoPeD-UnitTests/src/test/java/org/woped/core/controller/VEPControllerTest.java +++ b/WoPeD-UnitTests/src/test/java/org/woped/core/controller/VEPControllerTest.java @@ -9,7 +9,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.woped.core.Constants; +import org.woped.core.WoPeDConstants; import org.woped.core.utilities.ILogger; import org.woped.core.utilities.LoggerManager; @@ -96,7 +96,7 @@ public void getViewEventProcessorForType_oneRegisteredAndUnregistered_returnsEmp @Test public void unregister_processorNotRegistered_logsWarning() throws Exception { ILogger fakeLogger = mock(ILogger.class); - LoggerManager.register(fakeLogger, Constants.CORE_LOGGER); + LoggerManager.register(fakeLogger, WoPeDConstants.CORE_LOGGER); AbstractEventProcessor fakeProcessor = mock(AbstractEventProcessor.class); cut.unregister(TEST_VIEW_EVENT_TYPE, fakeProcessor); @@ -110,7 +110,7 @@ public void unregister_processorNotRegistered_logsWarning() throws Exception { @Test public void unregister_unregisterRegisteredProcessorTwice_logsWarning() throws Exception { ILogger fakeLogger = mock(ILogger.class); - LoggerManager.register(fakeLogger, Constants.CORE_LOGGER); + LoggerManager.register(fakeLogger, WoPeDConstants.CORE_LOGGER); AbstractEventProcessor fakeProcessor = mock(AbstractEventProcessor.class); cut.register(TEST_VIEW_EVENT_TYPE, fakeProcessor); diff --git a/WoPeD-UnitTests/src/test/java/org/woped/core/model/ModelElementContainerTest.java b/WoPeD-UnitTests/src/test/java/org/woped/core/model/ModelElementContainerTest.java index 832948bff..7b23b27b9 100644 --- a/WoPeD-UnitTests/src/test/java/org/woped/core/model/ModelElementContainerTest.java +++ b/WoPeD-UnitTests/src/test/java/org/woped/core/model/ModelElementContainerTest.java @@ -8,7 +8,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.woped.core.Constants; +import org.woped.core.WoPeDConstants; import org.woped.core.model.petrinet.AbstractPetriNetElementModel; import org.woped.core.model.petrinet.PlaceModel; import org.woped.core.model.petrinet.TransitionModel; @@ -33,7 +33,7 @@ public void addReference_missingSource_logsWarning() { ModelElementContainer sut = new ModelElementContainer(); ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); PlaceModel source = new PlaceModel(new CreationMap()); source.setId("fakeSource"); @@ -55,7 +55,7 @@ public void addReference_missingTarget_logsWarning() { ModelElementContainer sut = new ModelElementContainer(); ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); PlaceModel source = new PlaceModel(new CreationMap()); source.setId("fakeSource"); @@ -79,7 +79,7 @@ public void addReference_insertValidArc_arcExists() { ModelElementContainer sut = new ModelElementContainer(); ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); PlaceModel source = new PlaceModel(new CreationMap()); source.setId("fakeSource"); @@ -106,7 +106,7 @@ public void addReference_insertValidArc_logsMessage() { ModelElementContainer sut = new ModelElementContainer(); ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); PlaceModel source = new PlaceModel(new CreationMap()); source.setId("fakeSource"); @@ -140,7 +140,7 @@ public void addReference_insertArcTwice_logsWarning() { ModelElementContainer sut = new ModelElementContainer(); ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); PlaceModel source = new PlaceModel(new CreationMap()); source.setId("fakeSource"); @@ -167,7 +167,7 @@ public void hasReference_ReferenceExists_returnsTrue() { ModelElementContainer sut = new ModelElementContainer(); ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); PlaceModel source = new PlaceModel(new CreationMap()); source.setId("fakeSource"); @@ -192,7 +192,7 @@ public void hasReference_ReferenceNotExists_returnsFalse() { ModelElementContainer sut = new ModelElementContainer(); ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); PlaceModel source = new PlaceModel(new CreationMap()); source.setId("fakeSource"); @@ -216,7 +216,7 @@ public void hasReference_arcRemoved_returnsFalse() { ModelElementContainer sut = new ModelElementContainer(); ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); PlaceModel source = new PlaceModel(new CreationMap()); source.setId("fakeSource"); @@ -244,7 +244,7 @@ public void removeElement_HasReferences_ReferenceRemoved() { ModelElementContainer sut = new ModelElementContainer(); ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); PlaceModel source = new PlaceModel(new CreationMap()); source.setId("fakeSource"); @@ -270,7 +270,7 @@ public void removeArc_arcNotExists_logsWarning() { ModelElementContainer sut = new ModelElementContainer(); ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); ArcModel arc = mock(ArcModel.class); when(arc.getId()).thenReturn("arc1"); @@ -286,7 +286,7 @@ public void removeArc_arcExists_logsMessage() { ModelElementContainer sut = new ModelElementContainer(); ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); PlaceModel source = new PlaceModel(new CreationMap()); source.setId("fakeSource"); @@ -313,7 +313,7 @@ public void removeArc_validArc_arcRemovedFromArcMap() { ModelElementContainer sut = new ModelElementContainer(); ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); PlaceModel source = new PlaceModel(new CreationMap()); source.setId("fakeSource"); @@ -341,7 +341,7 @@ public void removeArc_validArc_arcRemovedFromSourceReferenceMap() { ModelElementContainer sut = new ModelElementContainer(); ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); PlaceModel source = new PlaceModel(new CreationMap()); source.setId("fakeSource"); @@ -377,7 +377,7 @@ public void getTargetElements_has2Targets_returnsTargets() { ModelElementContainer sut = new ModelElementContainer(); ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); PlaceModel source = new PlaceModel(new CreationMap()); source.setId("fakeSource"); @@ -433,7 +433,7 @@ public void getOutgoingArcs_noArcs_returnsEmptyMap() { ModelElementContainer sut = new ModelElementContainer(); ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); Map outgoingArcs = sut.getOutgoingArcs("notExistingId"); @@ -445,7 +445,7 @@ public void getOutgoingArcs_validSource_returnArcs() { ModelElementContainer sut = new ModelElementContainer(); ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); PlaceModel source = new PlaceModel(new CreationMap()); source.setId("fakeSource"); @@ -475,7 +475,7 @@ public void getOutgoingArcs_validSource_mapDoesNotContainSelfReference() { ModelElementContainer sut = new ModelElementContainer(); ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); PlaceModel source = new PlaceModel(new CreationMap()); source.setId("fakeSource"); @@ -502,7 +502,7 @@ public void getIncomingArcs_noArcs_returnsEmptyMap() { ModelElementContainer sut = new ModelElementContainer(); ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); Map incomingArcs = sut.getIncomingArcs("notExistingId"); @@ -514,7 +514,7 @@ public void getIncomingArcs_hasValidArc_mapContainsThisArc() { ModelElementContainer sut = new ModelElementContainer(); ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); PlaceModel source = new PlaceModel(new CreationMap()); source.setId("fakeSource"); @@ -558,7 +558,7 @@ public void findSourceElements_invalidId_mapIsEmpty() { ModelElementContainer sut = new ModelElementContainer(); ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); Map sourceElements = sut.findSourceElements("notExistingId"); @@ -571,7 +571,7 @@ public void findSourceElements_OneSource_MapContainsOnlyThatSource() { ModelElementContainer sut = new ModelElementContainer(); ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); PlaceModel source = new PlaceModel(new CreationMap()); source.setId("fakeSource"); @@ -616,7 +616,7 @@ public void getElementByType_wantsTransitions_returnCorrectNumber() { ModelElementContainer sut = new ModelElementContainer(); ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); PlaceModel source = new PlaceModel(new CreationMap()); source.setId("fakeSource"); diff --git a/WoPeD-UnitTests/src/test/java/org/woped/core/model/ModelElementFactoryTest.java b/WoPeD-UnitTests/src/test/java/org/woped/core/model/ModelElementFactoryTest.java index a925fbcde..b3e99a2f5 100644 --- a/WoPeD-UnitTests/src/test/java/org/woped/core/model/ModelElementFactoryTest.java +++ b/WoPeD-UnitTests/src/test/java/org/woped/core/model/ModelElementFactoryTest.java @@ -8,7 +8,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.woped.core.Constants; +import org.woped.core.WoPeDConstants; import org.woped.core.utilities.ILogger; import org.woped.core.utilities.LoggerManager; @@ -32,7 +32,7 @@ public void createArcModel_noId_returnsNull() { public void createArcModel_noId_logsError() { ILogger logger = mock(ILogger.class); - LoggerManager.register(logger, Constants.CORE_LOGGER); + LoggerManager.register(logger, WoPeDConstants.CORE_LOGGER); ModelElementFactory.createArcModel(null, null, null);