Changeset 385

Show
Ignore:
Timestamp:
07/27/10 00:25:07 (2 years ago)
Author:
ke
Message:

KahinaTree? needs to be Serializable too, otherwise Java will try to use the no-arg constructor when deserializing an object of a subclass, and miss the fields. Loading saved states is still buggy - something seems to go wrong with the views for tree layers 1 and 2.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r383 r385  
    3535import org.kahina.core.visual.source.KahinaSourceCodeView; 
    3636import org.kahina.core.visual.tree.KahinaTreeView; 
     37import org.kahina.tralesld.TraleSLDState; 
     38import org.kahina.tralesld.TraleSLDStep; 
    3739 
    3840public abstract class KahinaInstance<S extends KahinaState, G extends KahinaGUI, B extends KahinaBridge> implements KahinaListener 
    …… 
    149151                        ObjectInputStream in = new ObjectInputStream(zipFile.getInputStream(entry)); 
    150152                        state = castToStateType(in.readObject()); 
     153                        if (VERBOSE) 
     154                        { 
     155                                System.err.println(((TraleSLDState) state).getStepTree().getLayerDecider()); 
     156                        } 
    151157                        in.close(); 
    152158                        File directory = FileUtilities.createTemporaryDirectory(); 

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

    r384 r385  
    11package org.kahina.core.data.tree; 
    22 
     3import java.io.Serializable; 
    34import java.util.LinkedList; 
    45import java.util.List; 
    …… 
    67import org.kahina.core.data.KahinaObject; 
    78 
    8 public abstract class KahinaTree extends KahinaObject 
     9public abstract class KahinaTree extends KahinaObject implements Serializable 
    910{ 
    10     protected LayerDecider decider; 
     11    /** 
     12         *  
     13         */ 
     14        private static final long serialVersionUID = -7193259910680733711L; 
     15 
     16        protected LayerDecider decider; 
    1117 
    1218    private KahinaTree primaryModel; 

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

    r373 r385  
    1919 * A simple Kahina tree implementation which does not support layers. 
    2020 */ 
    21 public class KahinaUnlayeredMemTree extends KahinaTree implements Serializable 
     21public class KahinaUnlayeredMemTree extends KahinaTree 
    2222{     
    2323    /**