Project

General

Profile

« Previous | Next » 

Revision aec421fd

Added by Leszek Koltunski about 2 years ago

Downloaded Objects: subtle bugfix. We cannot use ObjectType in ObjectControl to check if two objects are the same because DownloadedObjects have ObjectType null !

View differences:

src/main/java/org/distorted/config/ConfigActivity.java
210 210 
        int meshState          = object.getMeshState();
211 211 
        InputStream jsonStream = object.getObjectStream(this);
212 212 
        InputStream meshStream = object.getMeshStream(this);
213 
        String name            = object.getUpperName();
213 214 

  		




  214
  
  
    
        control.changeIfDifferent(ordinal,meshState,jsonStream,meshStream);


  		




  
  215
  
    
        control.changeIfDifferent(ordinal,name,meshState,jsonStream,meshStream);


  		




  215
  216
  
    
        }


  		




  216
  217
  
    
      }


  		




  217
  218
  
    

  		












  

    
      src/main/java/org/distorted/main/RubikActivity.java
    
  





  493
  493
  
    
      int meshState = object!=null ? object.getMeshState() : MESH_NICE;


  		




  494
  494
  
    
      InputStream jsonStream = object==null ? null : object.getObjectStream(this);


  		




  495
  495
  
    
      InputStream meshStream = object==null ? null : object.getMeshStream(this);


  		




  
  496
  
    
      String name = object==null ? "NULL" : object.getUpperName();


  		




  496
  497
  
    

  		




  497
  
  
    
      control.changeIfDifferent(ordinal,meshState,jsonStream,meshStream);


  		




  
  498
  
    
      control.changeIfDifferent(ordinal,name,meshState,jsonStream,meshStream);


  		




  498
  499
  
    
      }


  		




  499
  500
  
    

  		




  500
  501
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		












  

    
      src/main/java/org/distorted/tutorials/TutorialActivity.java
    
  





  234
  234
  
    
      int meshState = object!=null ? object.getMeshState() : MESH_NICE;


  		




  235
  235
  
    
      InputStream jsonStream = object==null ? null : object.getObjectStream(this);


  		




  236
  236
  
    
      InputStream meshStream = object==null ? null : object.getMeshStream(this);


  		




  
  237
  
    
      String name = object==null ? "NULL" : object.getUpperName();


  		




  237
  238
  
    

  		




  238
  
  
    
      control.changeIfDifferent(ordinal,meshState,jsonStream,meshStream);


  		




  
  239
  
    
      control.changeIfDifferent(ordinal,name,meshState,jsonStream,meshStream);


  		




  239
  240
  
    
      }


  		




  240
  241
  
    

  		




  241
  242
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		












Also available in:  Unified diff