Project

General

Profile

« Previous | Next » 

Revision a7d8c3cd

Added by Leszek Koltunski over 2 years ago

Progress replacing the enum ObjetType with the class RubikObjectList.

View differences:

src/main/java/org/distorted/config/ConfigScreenPane.java
24 24 
import android.widget.LinearLayout;
25 25 
import android.widget.RadioButton;
26 26 
import android.widget.RadioGroup;
27 
import android.widget.RelativeLayout;
28 27 
import android.widget.TextView;
29 28 

  		




  30
  29
  
    
import org.distorted.jsons.ObjectJson;


  		




  31
  30
  
    
import org.distorted.main.R;


  		




  32
  31
  
    
import org.distorted.objectlib.json.JsonReader;


  		




  33
  
  
    
import org.distorted.objectlib.main.ObjectType;


  		




  
  32
  
    
import org.distorted.objects.RubikObject;


  		




  
  33
  
    
import org.distorted.objects.RubikObjectList;


  		




  34
  34
  
    

  		




  35
  35
  
    
import java.io.InputStream;


  		




  36
  36
  
    

  		




  ......




  90
  90
  
    

  		




  91
  91
  
    
    mObjectOrdinal = objectOrdinal;


  		




  92
  92
  
    

  		




  93
  
  
    
    ObjectType type = ObjectType.getObject(objectOrdinal);


  		




  94
  
  
    
    InputStream stream = ObjectJson.getStream(type,act);


  		




  
  93
  
    
    RubikObject object = RubikObjectList.getObject(objectOrdinal);


  		




  
  94
  
    
    int jsonID = object.getJsonID();


  		




  
  95
  
    
    InputStream stream = ObjectJson.getStream(jsonID,act);


  		




  95
  96
  
    
    mReader.parseJsonFileMetadata(stream);


  		




  96
  97
  
    

  		




  97
  98
  
    
    String name = mReader.getObjectName();


  		












Also available in:  Unified diff