version 1.0

donatellosantoro · Nov 9, 2015 · c365b46 · c365b46
1 parent 785fa78
commit c365b46
Show file tree

Hide file tree

Showing 63 changed files with 612 additions and 630 deletions.
diff --git a/LunaticGUI/commons/manifest.mf b/LunaticGUI/commons/manifest.mf
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: it.unibas.lunatic
 OpenIDE-Module-Localizing-Bundle: it/unibas/lunatic/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0
+OpenIDE-Module-Specification-Version: 1.0.1
 AutoUpdate-Essential-Module: true
diff --git a/LunaticGUI/commons/src/it/unibas/lunatic/BeansModel.java b/LunaticGUI/commons/src/it/unibas/lunatic/BeansModel.java
@@ -34,6 +34,7 @@ public boolean remove(String s, Object o) {
     }
 
     @Override
+    @SuppressWarnings("rawtypes")
     public void notifyChange(String key, Class beanClass) {
         impl.notifyChange(key, beanClass);
     }

diff --git a/LunaticGUI/commons/src/it/unibas/lunatic/IModel.java b/LunaticGUI/commons/src/it/unibas/lunatic/IModel.java
@@ -10,6 +10,7 @@ public interface IModel {
 
     boolean remove(String s, Object o);
 
+    @SuppressWarnings("rawtypes")
     public void notifyChange(String key, Class beanClass);
 
     String getName();

diff --git a/LunaticGUI/commons/src/it/unibas/lunatic/ITaskListener.java b/LunaticGUI/commons/src/it/unibas/lunatic/ITaskListener.java
@@ -2,10 +2,11 @@
 
 import javax.swing.SwingWorker;
 
-public interface ITaskListener<Task extends SwingWorker>{
+@SuppressWarnings("rawtypes")
+public interface ITaskListener<Task extends SwingWorker> {
 
     public void onTaskStarted(Task task);
-    
+
     public void onTaskCompleted(Task task);
 
     public void onTaskKilled(Task task);

diff --git a/LunaticGUI/commons/src/it/unibas/lunatic/impl/EventBusApplication.java b/LunaticGUI/commons/src/it/unibas/lunatic/impl/EventBusApplication.java
@@ -20,6 +20,7 @@ public IModelImpl createModel(String name) {
     }
 
     @Override
+    @SuppressWarnings("rawtypes")
     public void notifyChange(String key, Class beanClass) {
         EventObject ev = new AppModelChangeEvent(this, key, beanClass);
         logger.trace(ev.toString());

diff --git a/LunaticGUI/commons/src/it/unibas/lunatic/impl/model/AppModelChangeEvent.java b/LunaticGUI/commons/src/it/unibas/lunatic/impl/model/AppModelChangeEvent.java
@@ -4,6 +4,7 @@
 import it.unibas.lunatic.impl.EventBusApplication;
 import java.util.EventObject;
 
+@SuppressWarnings("rawtypes")
 public class AppModelChangeEvent extends EventObject {
 
     private final String beanName;

diff --git a/LunaticGUI/commons/src/it/unibas/lunatic/impl/model/BeanModelChangeEvent.java b/LunaticGUI/commons/src/it/unibas/lunatic/impl/model/BeanModelChangeEvent.java
@@ -3,6 +3,7 @@
 import it.unibas.lunatic.IModel;
 import java.util.EventObject;
 
+@SuppressWarnings("rawtypes")
 public class BeanModelChangeEvent extends EventObject {
 
     private final String beanName;

diff --git a/LunaticGUI/commons/src/it/unibas/lunatic/impl/model/EventBusModel.java b/LunaticGUI/commons/src/it/unibas/lunatic/impl/model/EventBusModel.java
@@ -15,6 +15,7 @@ public EventBusModel(String name, EventBus bus) {
     }
 
     @Override
+    @SuppressWarnings("rawtypes")
     public void notifyChange(String bean, Class beanClass) {
         EventObject ev = new BeanModelChangeEvent(this, name, bean, beanClass);
         logger.trace(ev.toString());

diff --git a/LunaticGUI/commons/src/it/unibas/lunatic/impl/model/ObservableModel.java b/LunaticGUI/commons/src/it/unibas/lunatic/impl/model/ObservableModel.java
@@ -35,6 +35,7 @@ public boolean remove(String s, Object o) {
     }
 
     @Override
+    @SuppressWarnings("rawtypes")
     public void notifyChange(String key, Class beanClass) {
         model.notifyChange(key, beanClass);
     }
@@ -56,6 +57,7 @@ public Model(String name) {
         }
 
         @Override
+        @SuppressWarnings("rawtypes")
         public void notifyChange(String key, Class type) {
             setChanged();
             notifyObservers(key);

diff --git a/LunaticGUI/gui/nbproject/project.properties b/LunaticGUI/gui/nbproject/project.properties
@@ -1,7 +1,7 @@
-javac.source=1.6
-javac.compilerargs=-Xlint -Xlint:-serial
-keystore=../lunatic.ks
-nbm.needs.restart=true
-nbm_alias=lunatic-essentials
-spec.version.base=1.0
-storepass=lunatictest
+javac.source=1.6
+javac.compilerargs=-Xlint -Xlint:-serial
+keystore=../lunatic.ks
+nbm.needs.restart=true
+nbm_alias=lunatic-essentials
+spec.version.base=1.1
+storepass=lunatictest
diff --git a/LunaticGUI/gui/src/it/unibas/lunatic/gui/action/cellgroups/ActionEditSelectedCellGroup.java b/LunaticGUI/gui/src/it/unibas/lunatic/gui/action/cellgroups/ActionEditSelectedCellGroup.java
@@ -5,6 +5,7 @@
 import it.unibas.lunatic.IModel;
 import it.unibas.lunatic.gui.R;
 import it.unibas.lunatic.core.CellGroupHelper;
+import it.unibas.lunatic.core.DbExtractor;
 import it.unibas.lunatic.gui.node.TableNode;
 import it.unibas.lunatic.gui.node.cellgroup.StepCellGroupNode;
 import it.unibas.lunatic.gui.node.chase.mc.ChaseStepNode;
@@ -40,6 +41,7 @@ public final class ActionEditSelectedCellGroup extends ContextAwareActionProxy<S
     private CellGroupHelper cgHelper = CellGroupHelper.getInstance();
     private TableWindowManager tableWindowManager = TableWindowManager.getInstance();
     private TableFinder tableFinder = new TableFinder();
+    private DbExtractor dbHelper = new DbExtractor();
 
     public ActionEditSelectedCellGroup() {
         putValue(NAME, Bundle.CTL_ActionEditSelectedCellGroup());
@@ -62,6 +64,7 @@ public void actionPerformed(ActionEvent ev) {
                     StepCellGroupNode editableCellGroupNode = getBean();
                     CellGroup cellGroup = editor.addChange(editableCellGroupNode.getChaseStep(), editableCellGroupNode.getCellGroup(), new ConstantValue(value), editableCellGroupNode.getChaseStep().getScenario());
                     editableCellGroupNode.setUserCellGroup(cellGroup);
+                    dbHelper.extractDb(userNode.getChaseStep());
                     logger.debug("Edited cellGroup: " + editableCellGroupNode.toString());
                     getModel().notifyChange(R.BeanProperty.SELECTED_CELL_GROUP_NODE, editableCellGroupNode.getClass());
                     updateOpenedTables(userNode);

diff --git a/LunaticGUI/gui/src/it/unibas/lunatic/gui/action/chase/ActionChaseContinue.java b/LunaticGUI/gui/src/it/unibas/lunatic/gui/action/chase/ActionChaseContinue.java
@@ -8,9 +8,15 @@
 import it.unibas.lunatic.gui.action.chase.task.InteractiveChase;
 import it.unibas.lunatic.gui.model.IChaseResult;
 import it.unibas.lunatic.gui.model.LoadedScenario;
+import it.unibas.lunatic.gui.model.McChaseResult;
+import it.unibas.lunatic.model.chase.chasemc.ChaseTree;
+import it.unibas.lunatic.model.chase.chasemc.DeltaChaseStep;
+import it.unibas.lunatic.model.chase.chasemc.usermanager.StandardUserManager;
+import it.unibas.lunatic.model.chase.commons.ChaseUtility;
 import it.unibas.lunatic.model.chase.commons.control.ChaseState;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.List;
 import javax.swing.Action;
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
@@ -58,14 +64,55 @@ public void actionPerformed(ActionEvent ev) {
     @Override
     public void onChange(IModel model, ChaseState chaseState) {
         LoadedScenario scenario = (LoadedScenario) model;
-        if (scenario != null
-                && scenario.get(R.BeanProperty.CHASE_STATE, ChaseState.class) == null
-                && scenario.getScenario().isMCScenario()
-                && scenario.get(R.BeanProperty.CHASE_RESULT, IChaseResult.class) != null
-                && scenario.getScenario().getUserManager() != null) {
-            setEnabled(true);
-        } else {
-            setEnabled(false);
+        boolean isInteractive = isInteractive(scenario);
+        setEnabled(isInteractive);
+    }
+
+    private boolean isInteractive(LoadedScenario loadedScenario) {
+        if (loadedScenario == null || !loadedScenario.getScenario().isMCScenario()) {
+            if (logger.isDebugEnabled()) logger.debug("## MCScenario not loaded [Interactive FALSE]");
+            return false;
+        }
+        if (loadedScenario.get(R.BeanProperty.CHASE_STATE, ChaseState.class) != null) {
+            if (logger.isDebugEnabled()) logger.debug("## Scenario is running [Interactive FALSE]");
+            return false;
+        }
+        if (loadedScenario.get(R.BeanProperty.CHASE_RESULT, IChaseResult.class) == null) {
+            if (logger.isDebugEnabled()) logger.debug("## Scenario not yet executed [Interactive FALSE]");
+            return false;
+        }
+        if (loadedScenario.getScenario().getUserManager() != null && !(loadedScenario.getScenario().getUserManager() instanceof StandardUserManager)) {
+            if (logger.isDebugEnabled()) logger.debug("## Scenario has user manager [Interactive TRUE]");
+            return true;
+        }
+        ChaseTree chaseTree = loadedScenario.get(R.BeanProperty.CHASE_RESULT, McChaseResult.class).getResult();
+        return leaveAreUserNodes(chaseTree.getRoot());
+    }
+
+    private boolean leaveAreUserNodes(DeltaChaseStep root) {
+        if (root == null) {
+            return false;
+        }
+        List<DeltaChaseStep> leaves = ChaseUtility.getAllLeaves(root);
+        if (logger.isDebugEnabled()) logger.debug("## Leaves: " + leaves.size());
+        for (DeltaChaseStep leave : leaves) {
+            if (leave.isEditedByUser()) {
+                if (logger.isDebugEnabled()) logger.debug("## Scenario has user node [Interactive TRUE]");
+                return true;
+            }
         }
+        if (logger.isDebugEnabled()) logger.debug("## Scenario has no user node [Interactive FALSE]");
+        return false;
     }
+//    @Override
+//    public void onChange(IModel model, ChaseState chaseState) {
+//        LoadedScenario scenario = (LoadedScenario) model;
+//        if (scenario != null
+//                && scenario.get(R.BeanProperty.CHASE_STATE, ChaseState.class) == null
+//                && scenario.getScenario().isMCScenario()
+//                && scenario.get(R.BeanProperty.CHASE_RESULT, IChaseResult.class) != null
+//                && scenario.getScenario().getUserManager() != null) {
+//            setEnabled(true);
+//        }
+//    }
 }
diff --git a/LunaticGUI/gui/src/it/unibas/lunatic/gui/action/chase/ActionCreateUserNode.java b/LunaticGUI/gui/src/it/unibas/lunatic/gui/action/chase/ActionCreateUserNode.java
@@ -1,11 +1,18 @@
 package it.unibas.lunatic.gui.action.chase;
 
+import it.unibas.lunatic.ContextAwareActionProxy;
+import it.unibas.lunatic.IModel;
 import it.unibas.lunatic.OperatorFactory;
 import it.unibas.lunatic.Scenario;
+import it.unibas.lunatic.core.DbExtractor;
 import it.unibas.lunatic.gui.R;
+import it.unibas.lunatic.gui.action.chase.task.ChaseTaskListener;
+import it.unibas.lunatic.gui.model.LoadedScenario;
 import it.unibas.lunatic.gui.node.chase.mc.ChaseStepNode;
 import it.unibas.lunatic.model.chase.chasemc.DeltaChaseStep;
 import it.unibas.lunatic.model.chase.chasemc.operators.AddUserNode;
+import it.unibas.lunatic.model.chase.commons.control.ChaseState;
+import it.unibas.lunatic.model.chase.commons.control.IChaseState;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import org.openide.DialogDisplayer;
@@ -23,15 +30,15 @@
 @Messages({
     "CTL_ActionCreateUserNode=Create user node",
     "MSG_UserNodeLimit=This step already has a user node",
-    "MSG_InvalidParent=An invalid step cannot have a user node",
-})
-public final class ActionCreateUserNode implements ActionListener {
+    "MSG_InvalidParent=An invalid step cannot have a user node",})
+public final class ActionCreateUserNode extends ContextAwareActionProxy<ChaseState> implements ActionListener {
+//public final class ActionCreateUserNode implements ActionListener {
 
     private NotifyDescriptor.Message limitDialog = new NotifyDescriptor.Message(Bundle.MSG_UserNodeLimit());
     private NotifyDescriptor.Message invalidDialog = new NotifyDescriptor.Message(Bundle.MSG_InvalidParent());
     private DialogDisplayer dialogDisplayer = DialogDisplayer.getDefault();
-    private final ChaseStepNode context;
     private OperatorFactory operatorFactory = OperatorFactory.getInstance();
+    private final ChaseStepNode context;
 
     public ActionCreateUserNode(ChaseStepNode context) {
         this.context = context;
@@ -48,6 +55,10 @@ public void actionPerformed(ActionEvent ev) {
             AddUserNode addUserNode = operatorFactory.getUserNodeCreator(scenario);
             DeltaChaseStep userChaseStep = addUserNode.addUserNode(context.getChaseStep(), scenario);
             context.addUserNode(userChaseStep);
+            context.refreshCellGroups();
+            LoadedScenario loadedScenario = app.get(R.Bean.LOADED_SCENARIO, LoadedScenario.class);
+            loadedScenario.put(R.BeanProperty.CHASE_STATE, new ChaseState());
+            loadedScenario.remove(R.BeanProperty.CHASE_STATE);
         }
     }
 
@@ -62,4 +73,13 @@ private boolean hasUserNode(ChaseStepNode context) {
         }
         return false;
     }
+
+    @Override
+    protected void register() {
+        super.registerBean(R.Bean.LOADED_SCENARIO, R.BeanProperty.CHASE_STATE, ChaseState.class);
+    }
+
+    @Override
+    public void onChange(IModel model, ChaseState bean) {
+    }
 }
diff --git a/LunaticGUI/gui/src/it/unibas/lunatic/gui/action/chase/task/ChaseTaskListener.java b/LunaticGUI/gui/src/it/unibas/lunatic/gui/action/chase/task/ChaseTaskListener.java
@@ -6,6 +6,7 @@
 import it.unibas.lunatic.gui.R;
 import it.unibas.lunatic.gui.model.IChaseResult;
 import it.unibas.lunatic.gui.model.LoadedScenario;
+import it.unibas.lunatic.model.chase.commons.ChaseStats;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintStream;
@@ -24,7 +25,7 @@
 
 @NbBundle.Messages({
     "MSG_ChaseScenario=Scenario chase in progress",
-    "MSG_ChaseSuccessful=Chase successful",
+    "MSG_ChaseSuccessful=Chase complete",
     "MSG_ChaseFailed=Chase failed",
     "MSG_ChaseStopping=stopping ",
     "MSG_ChaseCancelled=Chase cancelled",
@@ -55,7 +56,12 @@ public void onTaskCompleted(ChaseTask task) {
                 IChaseResult result = task.get();
                 LoadedScenario scenario = task.getScenario();
                 scenario.put(R.BeanProperty.CHASE_RESULT, result);
-                status.setStatusText(Bundle.MSG_ChaseSuccessful());
+                String statusText = Bundle.MSG_ChaseSuccessful();
+                Long exTime = ChaseStats.getInstance().getStat(ChaseStats.TOTAL_TIME);
+                if (exTime != null && exTime > 0) {
+                    statusText += " in " + exTime + " ms";
+                }
+                status.setStatusText(statusText);
                 for (String windowName : result.getWindowsToOpen()) {
                     view.show(windowName);
                 }

diff --git a/LunaticGUI/gui/src/it/unibas/lunatic/gui/action/chase/task/InteractiveChase.java b/LunaticGUI/gui/src/it/unibas/lunatic/gui/action/chase/task/InteractiveChase.java
@@ -8,6 +8,7 @@
 import it.unibas.lunatic.model.chase.chasemc.ChaseTree;
 import it.unibas.lunatic.model.chase.chasemc.DeltaChaseStep;
 import it.unibas.lunatic.model.chase.chasemc.operators.ChaseMCScenario;
+import it.unibas.lunatic.model.chase.chasemc.operators.PrintRankedSolutions;
 import it.unibas.lunatic.model.chase.chasemc.operators.RankSolutions;
 import it.unibas.lunatic.model.chase.commons.ChaseUtility;
 import it.unibas.lunatic.model.chase.commons.ChaserFactory;
@@ -16,6 +17,7 @@
 public class InteractiveChase implements IChaseOperator {
 
     private final RankSolutions solutionRanker = new RankSolutions();
+    private final PrintRankedSolutions solutionPrinter = new PrintRankedSolutions();
 
     @Override
     public IChaseResult chase(LoadedScenario loadedScenario) {
@@ -28,6 +30,7 @@ public IChaseResult chase(LoadedScenario loadedScenario) {
         chaseTree.setRoot(newRoot);
         if (ChaseUtility.hasChaseStats(scenario)) {
             solutionRanker.rankSolutions(chaseTree);
+            System.out.println(solutionPrinter.toString(chaseTree));
         }
         return new McChaseResult(loadedScenario, chaseTree);
     }

diff --git a/LunaticGUI/gui/src/it/unibas/lunatic/gui/action/chase/task/StandardChase.java b/LunaticGUI/gui/src/it/unibas/lunatic/gui/action/chase/task/StandardChase.java
@@ -9,18 +9,23 @@
 import it.unibas.lunatic.gui.model.McChaseResult;
 import it.unibas.lunatic.model.chase.chasede.DEChaserFactory;
 import it.unibas.lunatic.model.chase.chasede.IDEChaser;
+import it.unibas.lunatic.model.chase.chaseded.DEDChaserFactory;
 import it.unibas.lunatic.model.chase.chasemc.ChaseTree;
 import it.unibas.lunatic.model.chase.chasemc.operators.CellGroupIDGenerator;
 import it.unibas.lunatic.model.chase.chasemc.operators.ChaseMCScenario;
 import it.unibas.lunatic.model.chase.commons.ChaseStats;
 import speedy.model.database.IDatabase;
 import it.unibas.lunatic.model.chase.commons.ChaserFactory;
 import it.unibas.lunatic.model.chase.commons.control.IChaseState;
+import it.unibas.lunatic.persistence.relational.LunaticDBMSUtility;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import speedy.model.database.dbms.DBMSDB;
 import speedy.model.database.mainmemory.datasource.IntegerOIDGenerator;
+import speedy.model.database.operators.IDatabaseManager;
+import speedy.model.database.operators.dbms.SQLDatabaseManager;
 import speedy.persistence.relational.QueryStatManager;
+import speedy.utility.DBMSUtility;
 
 public class StandardChase implements IChaseOperator {
 
@@ -32,7 +37,9 @@ public IChaseResult chase(LoadedScenario loadedScenario) {
         IChaseState chaseState = loadedScenario.get(R.BeanProperty.CHASE_STATE, IChaseState.class);
         if (logger.isDebugEnabled()) logger.debug("Executing chase with configuration\n" + loadedScenario.getScenario().getConfiguration());
         IChaseResult result;
-        if (loadedScenario.getScenario().isDEScenario()) {
+        if (loadedScenario.getScenario().isDEDScenario()) {
+            result = chaseDEDScenario(loadedScenario, chaseState);
+        } else if (loadedScenario.getScenario().isDEScenario()) {
             result = chaseDEScenario(loadedScenario, chaseState);
         } else {
             result = chaseMCScenario(loadedScenario, chaseState);
@@ -47,6 +54,12 @@ private IChaseResult chaseDEScenario(LoadedScenario ls, IChaseState chaseState)
         return new DeChaseResult(ls, result);
     }
 
+    private IChaseResult chaseDEDScenario(LoadedScenario loadedScenario, IChaseState chaseState) {
+        Scenario scenario = loadedScenario.getScenario();
+        IDatabase result = DEDChaserFactory.getChaser(scenario).doChase(scenario, chaseState);
+        return new DeChaseResult(loadedScenario, result);
+    }
+
     private IChaseResult chaseMCScenario(LoadedScenario ls, IChaseState chaseState) {
         Scenario scenario = ls.getScenario();
         ChaseMCScenario chaser = ChaserFactory.getChaser(scenario);
@@ -68,5 +81,15 @@ private void reset(LoadedScenario loadedScenario) {
         if (scenario.getTarget() instanceof DBMSDB) {
             ((DBMSDB) scenario.getTarget()).reset();
         }
+        if (scenario.isDBMS() && !scenario.getSTTgds().isEmpty()) {
+            //Scenario has STTGDs. Need to clean target in order to avoid interaction btw sequential runs
+            if (logger.isDebugEnabled()) logger.debug("Cleaning target");
+            DBMSDB source = (DBMSDB) scenario.getSource();
+            DBMSDB target = (DBMSDB) scenario.getTarget();
+            DBMSUtility.removeSchema(target.getAccessConfiguration().getSchemaName(), source.getAccessConfiguration());
+            target.reset();
+            target.initDBMS();
+
+        }
     }
 }