Project

General

Profile

« Previous | Next » 

Revision 318c0a7d

Added by Leszek Koltunski over 2 years ago

Reename ObjectList to a more logical ObjectType.

View differences:

src/main/java/org/distorted/screens/RubikScreenPattern.java
30 30 
import android.widget.LinearLayout;
31 31 
import android.widget.TextView;
32 32 

  		




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


  		




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


  		




  34
  34
  
    

  		




  35
  35
  
    
import org.distorted.main.R;


  		




  36
  36
  
    
import org.distorted.dialogs.RubikDialogPattern;


  		




  ......




  63
  63
  
    
  void leaveScreen(RubikActivity act)


  		




  64
  64
  
    
    {


  		




  65
  65
  
    
    RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();


  		




  66
  
  
    
    ObjectList object = RubikPatternList.getObject(mPatternOrdinal);


  		




  
  66
  
    
    ObjectType object = RubikPatternList.getObject(mPatternOrdinal);


  		




  67
  67
  
    

  		




  68
  68
  
    
    if( !play.setObject(act,object) )


  		




  69
  69
  
    
      {


  		




  70
  70
  
    
      int objectPlay= play.getObject();


  		




  71
  71
  
    

  		




  72
  
  
    
      act.changeObject(ObjectList.getObject(objectPlay),false);


  		




  
  72
  
    
      act.changeObject(ObjectType.getObject(objectPlay),false);


  		




  73
  73
  
    
      }


  		




  74
  74
  
    
    }


  		




  75
  75
  
    

  		












Also available in:  Unified diff