Revision 314e9ff0
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objects/RubikObjectList.java | ||
|---|---|---|
| 19 | 19 |
|
| 20 | 20 |
package org.distorted.objects; |
| 21 | 21 |
|
| 22 |
import java.io.InputStream; |
|
| 23 | 22 |
import java.util.ArrayList; |
| 24 | 23 |
|
| 25 |
import android.app.Activity; |
|
| 26 | 24 |
import android.content.SharedPreferences; |
| 27 | 25 |
|
| 28 |
import org.distorted.jsons.ObjectJson; |
|
| 29 | 26 |
import org.distorted.main.RubikActivity; |
| 30 | 27 |
import org.distorted.objectlib.main.ObjectConstants; |
| 31 | 28 |
import org.distorted.objectlib.main.ObjectType; |
| ... | ... | |
| 48 | 45 |
private static ArrayList<RubikObject> mObjects; |
| 49 | 46 |
private static int mObject = DEF_OBJECT; |
| 50 | 47 |
|
| 51 |
private static class DownloadedObject
|
|
| 48 |
public static class DownloadedObject
|
|
| 52 | 49 |
{
|
| 53 | 50 |
String shortName; |
| 54 | 51 |
boolean icon,object,extras; |
| ... | ... | |
| 101 | 98 |
mObjects.add(obj); |
| 102 | 99 |
mNumObjects++; |
| 103 | 100 |
|
| 104 |
if( obj.getExtrasJsonID()!=0 )
|
|
| 101 |
if( obj.hasExtras() )
|
|
| 105 | 102 |
{
|
| 106 | 103 |
obj.setExtrasOrdinal(mNumExtras); |
| 107 | 104 |
mNumExtras++; |
| ... | ... | |
| 113 | 110 |
|
| 114 | 111 |
private static void internalAddDownloadedObject(DownloadedObject object) |
| 115 | 112 |
{
|
| 113 |
/* |
|
| 114 |
boolean existsAlready = false; |
|
| 115 |
String name = object.shortName; |
|
| 116 |
|
|
| 117 |
for(RubikObject ro : mObjects ) |
|
| 118 |
if( ro.getName().equals(name) ) |
|
| 119 |
{
|
|
| 120 |
ro.updateObject(object); |
|
| 121 |
existsAlready = true; |
|
| 122 |
break; |
|
| 123 |
} |
|
| 124 |
|
|
| 125 |
if( !existsAlready ) |
|
| 126 |
{
|
|
| 127 |
RubikObject obj = new RubikObject(object); |
|
| 128 |
mObjects.add(obj); |
|
| 129 |
mNumObjects++; |
|
| 116 | 130 |
|
| 131 |
if( obj.getExtrasJsonID()!=0 ) |
|
| 132 |
{
|
|
| 133 |
obj.setExtrasOrdinal(mNumExtras); |
|
| 134 |
mNumExtras++; |
|
| 135 |
} |
|
| 136 |
} |
|
| 137 |
*/ |
|
| 117 | 138 |
} |
| 118 | 139 |
|
| 119 | 140 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 356 | 377 |
return mNumExtras; |
| 357 | 378 |
} |
| 358 | 379 |
|
| 359 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 360 |
|
|
| 361 |
public static InputStream getExtrasStream(int extrasOrdinal, Activity act) |
|
| 362 |
{
|
|
| 363 |
int objectOrdinal = getObjectOrdinal(extrasOrdinal); |
|
| 364 |
RubikObject object= getObject(objectOrdinal); |
|
| 365 |
|
|
| 366 |
if( object!=null ) |
|
| 367 |
{
|
|
| 368 |
int jsonID = object.getExtrasJsonID(); |
|
| 369 |
return ObjectJson.getExtrasStream(jsonID,act); |
|
| 370 |
} |
|
| 371 |
|
|
| 372 |
return null; |
|
| 373 |
} |
|
| 374 |
|
|
| 375 | 380 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 376 | 381 |
|
| 377 | 382 |
public static int getObjectOrdinal(int extrasOrdinal) |
Also available in: Unified diff
Refactor RubikObject in preparation for creating RubikObjects from DownloadedObjects.