Changeset 379

Show
Ignore:
Timestamp:
07/24/10 01:13:10 (2 years ago)
Author:
ke
Message:

Removed everything database-related. Good riddance!

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r378 r379  
    123123                { 
    124124                        saveSessionAs(e.getFile()); 
    125                 } 
     125                } else if (type == KahinaSessionEvent.LOAD_SESSION) 
     126                { 
     127                        loadSession(e.getFile()); 
     128                } 
     129        } 
     130 
     131        private void loadSession(File file) 
     132        { 
     133                // TODO Auto-generated method stub 
     134                 
    126135        } 
    127136 

  • kahina/trunk/src/org/kahina/core/KahinaRunner.java

    r375 r379  
    22 
    33import org.kahina.core.control.KahinaController; 
    4 import org.kahina.core.data.CachingDbDataManager; 
    54import org.kahina.core.data.DataManager; 
    6 import org.kahina.core.data.DbDataManager; 
    75import org.kahina.core.data.KahinaDataHandlingMethod; 
    86import org.kahina.core.data.MagazineDataManager; 
    97import org.kahina.core.data.MemDataManager; 
    108import org.kahina.core.event.KahinaEvent; 
    11 import org.kahina.core.io.database.DatabaseHandler; 
    129 
    1310public class KahinaRunner 
    …… 
    2623        { 
    2724            setDataManager(new MemDataManager()); 
    28         } 
    29         else if (dataHandlingType == KahinaDataHandlingMethod.DATABASE) 
    30         { 
    31             setDataManager(new CachingDbDataManager(new DatabaseHandler(DatabaseHandler.DatabaseType.DERBY))); 
    3225        } else 
    3326        { 
    …… 
    5952    } 
    6053     
    61     public static DatabaseHandler getDatabaseHandler() 
    62     { 
    63         if (dm instanceof DbDataManager) 
    64         { 
    65             return ((DbDataManager) dm).getDatabaseHandler(); 
    66         } 
    67         else 
    68         { 
    69             return null; 
    70         } 
    71     } 
    72      
    7354    public static void processEvent(KahinaEvent e) 
    7455    { 

  • kahina/trunk/src/org/kahina/core/data/KahinaDataHandlingMethod.java

    r369 r379  
    33public enum KahinaDataHandlingMethod 
    44{ 
    5     MEMORY, DATABASE, MAGAZINE; 
     5    MEMORY, MAGAZINE; 
    66} 

  • kahina/trunk/src/org/kahina/core/data/MemDataManager.java

    r375 r379  
    44import java.util.HashMap; 
    55import java.util.Map; 
    6  
    7 import javax.swing.ProgressMonitor; 
    86 
    97import org.kahina.core.KahinaException; 

  • kahina/trunk/src/org/kahina/core/data/chart/KahinaChart.java

    r369 r379  
    55import org.kahina.core.data.KahinaDataHandlingMethod; 
    66import org.kahina.core.data.KahinaObject; 
    7 import org.kahina.core.io.database.DatabaseHandler; 
    87import org.w3c.dom.Document; 
    98import org.w3c.dom.Element; 
    …… 
    130129        } 
    131130 
    132         public static KahinaChart importXML(Document dom, KahinaDataHandlingMethod dataHandlingMethod, DatabaseHandler db) 
     131        public static KahinaChart importXML(Document dom, KahinaDataHandlingMethod dataHandlingMethod) 
    133132        { 
    134                 KahinaChart m; 
    135                 if (dataHandlingMethod == KahinaDataHandlingMethod.DATABASE) 
    136                 { 
    137                         m = new KahinaDbChart(); 
    138                 } else 
    139                 { 
    140                         m = new KahinaMemChart(); 
    141                 } 
     133                KahinaChart m = new KahinaMemChart(); 
    142134                NodeList segments = dom.getElementsByTagName("segment"); 
    143135                for (int i = 0; i < segments.getLength(); i++) 

  • kahina/trunk/src/org/kahina/core/data/source/KahinaSourceFileRegistry.java

    r146 r379  
    55 
    66import org.kahina.core.data.KahinaObject; 
    7 import org.kahina.core.data.lightweight.LightweightKahinaObject; 
    87 
    9 public class KahinaSourceFileRegistry extends KahinaObject implements LightweightKahinaObject 
     8public class KahinaSourceFileRegistry extends KahinaObject 
    109{ 
    1110    //map from full source file names to source file models 

  • kahina/trunk/src/org/kahina/core/data/text/KahinaLineReference.java

    r369 r379  
    44 
    55import org.kahina.core.data.KahinaObject; 
    6 import org.kahina.core.data.lightweight.LightweightKahinaObject; 
    76 
    8 public class KahinaLineReference extends KahinaObject implements LightweightKahinaObject, Serializable 
     7public class KahinaLineReference extends KahinaObject implements Serializable 
    98{ 
    109    /** 

  • kahina/trunk/src/org/kahina/core/data/text/KahinaText.java

    r369 r379  
    99 
    1010import org.kahina.core.data.KahinaObject; 
    11 import org.kahina.core.data.lightweight.LightweightKahinaObject; 
    1211 
    13 public class KahinaText extends KahinaObject implements LightweightKahinaObject, Serializable 
     12public class KahinaText extends KahinaObject implements Serializable 
    1413{ 
    1514    /** 

  • kahina/trunk/src/org/kahina/core/data/text/KahinaTextModel.java

    r369 r379  
    44 
    55import org.kahina.core.data.KahinaObject; 
    6 import org.kahina.core.data.lightweight.LightweightKahinaObject; 
    76 
    8 public class KahinaTextModel extends KahinaObject implements LightweightKahinaObject, Serializable 
     7public class KahinaTextModel extends KahinaObject implements Serializable 
    98{ 
    109        /** 

  • kahina/trunk/src/org/kahina/core/data/text/KahinaTextWithMarking.java

    r146 r379  
    22 
    33import org.kahina.core.data.KahinaObject; 
    4 import org.kahina.core.data.lightweight.LightweightKahinaObject; 
    54 
    6 public class KahinaTextWithMarking extends KahinaObject implements LightweightKahinaObject 
     5public class KahinaTextWithMarking extends KahinaObject 
    76{ 
    87    public String text; 

  • kahina/trunk/src/org/kahina/core/data/tree/DefaultLayerDecider.java

    r373 r379  
    11package org.kahina.core.data.tree; 
    22 
    3 import org.kahina.core.data.lightweight.LightweightKahinaObject; 
    4  
    5 public class DefaultLayerDecider extends LayerDecider implements LightweightKahinaObject 
     3public class DefaultLayerDecider extends LayerDecider 
    64{ 
    75        /** 

  • kahina/trunk/src/org/kahina/core/data/tree/KahinaMemTree.java

    r373 r379  
    110110        } 
    111111 
    112         public static KahinaTree importXML(Document dom) 
     112        public static KahinaTree importXML(Document dom, LayerDecider decider) 
    113113        { 
    114114                KahinaMemTree m = new KahinaMemTree(); 
     115                m.decider = decider; 
    115116                Element treeElement = dom.getDocumentElement(); 
    116117                NodeList childNodes = treeElement.getChildNodes(); 

  • kahina/trunk/src/org/kahina/core/gui/KahinaSessionMenu.java

    r377 r379  
    3939    } 
    4040     
     41    @Override 
    4142    public void actionPerformed(ActionEvent e) 
    4243    { 

  • kahina/trunk/src/org/kahina/core/test/KahinaChartTest.java

    r357 r379  
    3131            //DatabaseHandler data = new DatabaseHandler(new File("otoka.dat")); 
    3232            //KahinaChart m = KahinaChart.importXML(dom, KahinaDataHandlingMethod.DATABASE, data); 
    33             KahinaChart m = KahinaChart.importXML(dom, KahinaDataHandlingMethod.MEMORY, null); 
     33            KahinaChart m = KahinaChart.importXML(dom, KahinaDataHandlingMethod.MEMORY); 
    3434            KahinaChartView v = new KahinaChartView(); 
    3535            v.display(m);        

  • kahina/trunk/src/org/kahina/core/test/KahinaTreeTest.java

    r362 r379  
    1414import org.kahina.core.KahinaRunner; 
    1515import org.kahina.core.data.KahinaDataHandlingMethod; 
    16 import org.kahina.core.data.tree.KahinaDbTree; 
     16import org.kahina.core.data.tree.KahinaMemTree; 
    1717import org.kahina.core.data.tree.KahinaTree; 
    1818import org.kahina.core.data.tree.LayerDecider; 
    19 import org.kahina.core.io.database.DatabaseHandler; 
    2019import org.kahina.core.visual.tree.KahinaTreeView; 
    2120import org.kahina.core.visual.tree.KahinaTreeViewMarker; 
    …… 
    3130        { 
    3231                LayerDecider decider = new TestLayerDecider(); 
    33                 DatabaseHandler data = new DatabaseHandler(DatabaseHandler.DatabaseType.DERBY); 
    3432                 
    3533            File file = new File("src/org/kahina/core/test/trale-tree.xml"); 
    …… 
    3836            Document dom = db.parse(file); 
    3937            //TestLayeredTree m1 = TestLayeredTree.importXML(dom); 
    40             KahinaTree m1 = KahinaDbTree.importXML(dom, decider, data, null); 
     38            KahinaTree m1 = KahinaMemTree.importXML(dom, decider); 
    4139             
    4240            file = new File("src/org/kahina/core/test/trale-tree2.xml"); 

  • kahina/trunk/src/org/kahina/lp/LogicProgrammingStep.java

    r369 r379  
    33import org.kahina.core.KahinaRunner; 
    44import org.kahina.core.KahinaStep; 
    5 import org.kahina.core.data.lightweight.LightweightKahinaObject; 
    65import org.kahina.core.data.source.KahinaSourceCodeLocation; 
    76 
    8 public class LogicProgrammingStep extends KahinaStep implements LightweightKahinaObject 
     7public class LogicProgrammingStep extends KahinaStep 
    98{     
    109    /** 

  • kahina/trunk/src/org/kahina/tralesld/TraleSLDRunner.java

    r371 r379  
    44import org.kahina.core.KahinaStep; 
    55import org.kahina.core.data.DataManager; 
    6 import org.kahina.core.data.DbDataManager; 
    76import org.kahina.core.data.KahinaDataHandlingMethod; 
    87import org.kahina.core.data.source.KahinaSourceCodeLocation; 
    98import org.kahina.core.data.source.KahinaSourceFileModel; 
    10 import org.kahina.core.data.text.KahinaConstantDbTextStore; 
    119import org.kahina.core.data.text.KahinaText; 
    1210import org.kahina.core.data.text.KahinaTextModel; 
    …… 
    7573                dm.registerDataType(TraleSLDVariableBindingSet.class); 
    7674                dm.registerDataType(KahinaTextModel.class); 
    77                 // *slaps himself for the following code* TODO think of a more elegant 
    78                 // and general solution for such switches. 
    79                 if (dm instanceof DbDataManager) 
    80                 { 
    81                         dm.registerDataType(KahinaText.class, new KahinaConstantDbTextStore((DbDataManager) dm, getDatabaseHandler())); 
    82                 } else 
    83                 { 
    84                         dm.registerDataType(KahinaText.class); 
    85                 } 
     75                dm.registerDataType(KahinaText.class); 
    8676        } 
    8777 

  • kahina/trunk/src/org/kahina/tralesld/data/fs/TraleSLDFS.java

    r370 r379  
    22 
    33import org.kahina.core.data.KahinaObject; 
    4 import org.kahina.core.data.lightweight.LightweightKahinaObject; 
    54 
    65/** 
    …… 
    98 * 
    109 */ 
    11 public abstract class TraleSLDFS extends KahinaObject implements LightweightKahinaObject 
     10public abstract class TraleSLDFS extends KahinaObject 
    1211{ 
    1312         

  • kahina/trunk/src/org/kahina/tralesld/data/fs/TraleSLDVariableBinding.java

    r370 r379  
    44 
    55import org.kahina.core.data.KahinaObject; 
    6 import org.kahina.core.data.lightweight.LightweightKahinaObject; 
    76import org.kahina.core.util.Utilities; 
    87 
    9 public class TraleSLDVariableBinding extends KahinaObject implements LightweightKahinaObject, Serializable 
     8public class TraleSLDVariableBinding extends KahinaObject implements Serializable 
    109{ 
    1110 

  • kahina/trunk/src/org/kahina/tulipa/TulipaRunner.java

    r369 r379  
    44import org.kahina.core.KahinaStep; 
    55import org.kahina.core.data.DataManager; 
    6 import org.kahina.core.data.DbDataManager; 
    76import org.kahina.core.data.KahinaDataHandlingMethod; 
    87import org.kahina.core.data.source.KahinaSourceCodeLocation; 
    98import org.kahina.core.data.source.KahinaSourceFileModel; 
    10 import org.kahina.core.data.text.KahinaConstantDbTextStore; 
    119import org.kahina.core.data.text.KahinaText; 
    1210import org.kahina.core.data.text.KahinaTextModel; 
    …… 
    2422        dm.registerDataType(KahinaTextModel.class); 
    2523        dm.registerDataType(TulipaStep.class); 
    26         // *slaps himself for the following code* TODO think of a more elegant and general solution for such switches. 
    27         if (dm instanceof DbDataManager) 
    28         { 
    29             dm.registerDataType(KahinaText.class, new KahinaConstantDbTextStore((DbDataManager) dm, getDatabaseHandler())); 
    30         }  
    31         else 
    32         { 
    33             dm.registerDataType(KahinaText.class); 
    34         } 
     24        dm.registerDataType(KahinaText.class); 
    3525        /*dm.registerDataType(KahinaLineReference.class); 
    3626        dm.registerDataType(LogicProgrammingLineReference.class); 

  • kahina/trunk/src/org/kahina/tulipa/data/grammar/TulipaGrammar.java

    r373 r379  
    55 
    66import org.kahina.core.data.KahinaObject; 
    7 import org.kahina.core.data.lightweight.LightweightKahinaObject; 
    87 
    9 public class TulipaGrammar extends KahinaObject implements LightweightKahinaObject, Serializable 
     8public class TulipaGrammar extends KahinaObject implements Serializable 
    109{ 
    1110        /** 

  • kahina/trunk/test/org/kahina/tralesld/data/fs/BracketPackerTest.java

    r370 r379  
    1212import org.junit.Test; 
    1313import org.kahina.core.data.DataManager; 
    14 import org.kahina.core.data.DbDataManager; 
    1514import org.kahina.core.data.MemDataManager; 
    16 import org.kahina.core.io.database.DatabaseHandler; 
    1715 
    1816public class BracketPackerTest 
    …… 
    2624                dm.registerDataType(TraleSLDPackedFSTerminal.class); 
    2725                test(dm); 
    28         } 
    29          
    30         @Test 
    31         public void dbTest() 
    32         { 
    33                 DatabaseHandler db = new DatabaseHandler(DatabaseHandler.DatabaseType.DERBY); 
    34                 DataManager dm = new DbDataManager(db); 
    35                 dm.registerDataType(TraleSLDPackedFSNonTerminal.class); 
    36                 dm.registerDataType(TraleSLDPackedFSTerminal.class); 
    37                 test(dm); 
    38                 db.close(); 
    3926        } 
    4027