Changeset 1057

Timestamp:

01/24/12 23:48:01 (4 months ago)

Author:

ke

Message:

Step counter in main window title is now slightly less hacky, is updated correctly when a session is loaded.

Files:

• trunk/src/org/kahina/core/KahinaInstance.java (modified) (2 diffs)
• trunk/src/org/kahina/core/KahinaState.java (modified) (2 diffs)
• trunk/src/org/kahina/core/control/KahinaSystemEvent.java (modified) (1 diff)
• trunk/src/org/kahina/core/gui/windows/KahinaMainWindow.java (modified) (5 diffs)
• trunk/src/org/kahina/core/gui/windows/KahinaWindow.java (modified) (1 diff)
• trunk/src/org/kahina/lp/LogicProgrammingState.java (modified) (1 diff)
• trunk/src/org/kahina/lp/bridge/LogicProgrammingBridge.java (modified) (1 diff)
• trunk/src/org/kahina/tralesld/TraleSLDState.java (modified) (1 diff)

trunk/src/org/kahina/core/KahinaInstance.java

@@ -128 +128 @@
-                if (state != null)
-                {
-reset
+initialize
-                } else
-                {
@@ -228 +228 @@
-                        gui.displayMainViews();
-                        KahinaRunner.processEvent(new KahinaSelectionEvent(state.getSelectedStepID()));
+                        KahinaRunner.processEvent(new KahinaSystemEvent(KahinaSystemEvent.NODE_COUNT, state.getStepCount()));
-                } catch (Exception e)
-                {

trunk/src/org/kahina/core/KahinaState.java

@@ -50 +50 @@
-    public KahinaState()
-    {
-
-
-
-
+
-        KahinaRunner.getControl().registerListener(KahinaEventTypes.SELECTION, this);
-    }
-    
-reset
+initialize
-        {
+                selectedStepID = -1;
+                nextStepID = 1;
-                //console is refilled for each new process
-                //TODO: think about an additional console for global events (warnings etc.)
@@ -74 +73 @@
-        }
-        return nextStepID++;
+    }
+    
+    public int getStepCount()
+    {
+        return nextStepID - 1;
-    }
-    

trunk/src/org/kahina/core/control/KahinaSystemEvent.java

@@ -9 +9 @@
-    public static final int QUIT = 0;
-    public static final int APPLY_BREAKPOINTS = 1;
+    public static final int NODE_COUNT = 2;
-    
-    public KahinaSystemEvent(int systemEventType)

trunk/src/org/kahina/core/gui/windows/KahinaMainWindow.java

@@ -3 +3 @@
-import java.awt.Container;
-import java.awt.dnd.DropTarget;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
-import javax.swing.JMenuBar;
-
-import org.kahina.core.KahinaRunner;
-import org.kahina.core.control.KahinaEvent;
-import org.kahina.core.control.KahinaEventTypes;
-import org.kahina.core.control.KahinaListener;
-import org.kahina.core.control.KahinaSessionEvent;
-import org.kahina.core.control.KahinaSystemEvent;
-import org.kahina.core.data.tree.KahinaTreeEvent;
-import org.kahina.core.data.tree.KahinaTreeEventType;
-import org.kahina.core.gui.KahinaSessionMenu;
-import org.kahina.core.gui.KahinaWindowManager;
@@ -48 +42 @@
-        {
-                this.setTitle("Kahina");
-                wm.getControl().registerListener(KahinaEventTypes.TREE, this);
-                // this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-                // Uncomment this in order to be able to profile using JRat.
@@ -64 +57 @@
-
-                wm.getControl().registerListener(KahinaEventTypes.SYSTEM, this);
-                wm.getControl().registerListener(KahinaEventTypes.SESSION, this);
-        }
-
@@ -148 +140 @@
-        public void processEvent(KahinaEvent event)
-        {
-
-
-
-
+
-                {
-                        processSystemEvent((KahinaSystemEvent) event);
-                } else if (event instanceof KahinaSessionEvent)
-                {
-                        processSessionEvent((KahinaSessionEvent) event);
-                }
-        }
-
-        private void processSessionEvent(KahinaSessionEvent event)
-        {
-                if (event.getSessionEventType() == KahinaSessionEvent.LOAD_SESSION)
-                {
-                        // TODO This is a kludge, see below.
-                        setTitle("Kahina");
-                }
-        }
-
-        private void processTreeEvent(KahinaTreeEvent event)
-        {
-                if (event.getTreeEventType() == KahinaTreeEventType.NEW_NODE)
-                {
-                        // TODO This is a kludge, we should synchronize the step
-                        // count with the state. But first, the architecture needs to be
-                        // changed to allow access to the state.
-                        setTitle("Kahina (" + event.getFirstID() + ")");
-                }
-        }
@@ -182 +148 @@
-        private void processSystemEvent(KahinaSystemEvent event)
-        {
-
+
+
+
+
-                {
-                        disposeAllWindows();

trunk/src/org/kahina/core/gui/windows/KahinaWindow.java

@@ -150 +150 @@
-    public void setTitle(String title)
-    {
-
+
+
+
+
-        super.setTitle(title);
-        mainPanel.setTitle(title);

trunk/src/org/kahina/lp/LogicProgrammingState.java

@@ -63 +63 @@
-    }
-    
-reset
-
-reset
+initialize
+
+initialize
-        stepTree = new KahinaMemTree();
-        secondaryStepTree = new KahinaMemTree();

trunk/src/org/kahina/lp/bridge/LogicProgrammingBridge.java

@@ -247 +247 @@
-                        KahinaRunner.processEvent(new LogicProgrammingBridgeEvent(LogicProgrammingBridgeEventType.STEP_CALL, stepID, parentCandidateID));
-                        // used by node counter:
-TreeEvent(KahinaTreeEventType.NEW_NODE, stepID, parentCandidate
+SystemEvent(KahinaSystemEvent.NODE_COUNT, step
-                        currentID = stepID;
-                        parentCandidateID = stepID;

trunk/src/org/kahina/tralesld/TraleSLDState.java

@@ -38 +38 @@
-        }
-        
-reset
+initialize
-        {
-reset
+initialize
-                //keep signature and auxiliary instance (constant across parses)
-                chart = new KahinaMemChart();