Refactor references to classes moved to inner packages

This commit is contained in:
Ricardo Carrillo Cruz 2013-05-12 12:22:12 +02:00
parent 95f2f27f57
commit 33757b3596
63 changed files with 119 additions and 55 deletions

View File

@ -2,6 +2,14 @@ package com.rcarrillocruz.android.openstackdroid;
import java.util.ArrayList;
import java.util.List;
import com.rcarrillocruz.android.openstackdroid.model.FlavorModel;
import com.rcarrillocruz.android.openstackdroid.model.ImageModel;
import com.rcarrillocruz.android.openstackdroid.model.ServerModel;
import com.rcarrillocruz.android.openstackdroid.model.TenantModel;
import com.rcarrillocruz.android.openstackdroid.model.UserModel;
import com.rcarrillocruz.android.openstackdroid.model.VolumeModel;
import android.os.Bundle;
import android.view.MenuItem;
import android.widget.FrameLayout;

View File

@ -22,6 +22,8 @@ import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils;
import com.rcarrillocruz.android.openstackdroid.operations.ApiOperation;
import android.app.IntentService;
import android.content.Intent;
import android.net.Uri;
@ -32,13 +34,13 @@ import android.widget.Toast;
public class CloudControllerService extends IntentService {
public static final String TAG = CloudControllerResultReceiver.class.getName();
public static final String GET_TOKEN_OPERATION = "com.rcarrillocruz.android.openstackdroid.GetTokenOperation";
public static final String GET_SERVERS_OPERATION = "com.rcarrillocruz.android.openstackdroid.GetServersOperation";
public static final String GET_VOLUMES_OPERATION = "com.rcarrillocruz.android.openstackdroid.GetVolumesOperation";
public static final String GET_IMAGES_OPERATION = "com.rcarrillocruz.android.openstackdroid.GetImagesOperation";
public static final String GET_FLAVORS_OPERATION = "com.rcarrillocruz.android.openstackdroid.GetFlavorsOperation";
public static final String GET_USERS_OPERATION = "com.rcarrillocruz.android.openstackdroid.GetUsersOperation";
public static final String GET_TENANTS_OPERATION = "com.rcarrillocruz.android.openstackdroid.GetTenantsOperation";
public static final String GET_TOKEN_OPERATION = "com.rcarrillocruz.android.openstackdroid.operations.identity.GetTokenOperation";
public static final String GET_SERVERS_OPERATION = "com.rcarrillocruz.android.openstackdroid.operations.compute.GetServersOperation";
public static final String GET_VOLUMES_OPERATION = "com.rcarrillocruz.android.openstackdroid.operations.volume.GetVolumesOperation";
public static final String GET_IMAGES_OPERATION = "com.rcarrillocruz.android.openstackdroid.operations.image.GetImagesOperation";
public static final String GET_FLAVORS_OPERATION = "com.rcarrillocruz.android.openstackdroid.operations.compute.GetFlavorsOperation";
public static final String GET_USERS_OPERATION = "com.rcarrillocruz.android.openstackdroid.operations.identity.GetUsersOperation";
public static final String GET_TENANTS_OPERATION = "com.rcarrillocruz.android.openstackdroid.operations.identity.GetTenantsOperation";
public static final String OPERATION = "com.rcarrillocruz.android.openstackdroid.OPERATION";
public static final String TOKEN = "com.rcarrillocruz.android.openstackdroid.TOKEN";

View File

@ -1,5 +1,7 @@
package com.rcarrillocruz.android.openstackdroid;
import com.rcarrillocruz.android.openstackdroid.model.FlavorModel;
import android.app.Fragment;
import android.os.Bundle;
import android.util.TypedValue;

View File

@ -4,6 +4,9 @@ import java.util.Iterator;
import java.util.List;
import com.google.gson.Gson;
import com.rcarrillocruz.android.openstackdroid.json.compute.FlavorDetailsObject;
import com.rcarrillocruz.android.openstackdroid.json.compute.GetFlavorsResponse;
import com.rcarrillocruz.android.openstackdroid.model.FlavorModel;
import android.app.FragmentTransaction;
import android.content.Intent;

View File

@ -1,5 +1,7 @@
package com.rcarrillocruz.android.openstackdroid;
import com.rcarrillocruz.android.openstackdroid.model.ImageModel;
import android.app.Fragment;
import android.os.Bundle;
import android.util.TypedValue;

View File

@ -15,6 +15,9 @@ import android.widget.ListView;
import com.google.gson.Gson;
import com.rcarrillocruz.android.openstackdroid.CloudControllerResultReceiver.Receiver;
import com.rcarrillocruz.android.openstackdroid.json.image.GetImagesResponse;
import com.rcarrillocruz.android.openstackdroid.json.image.ImageDetailsObject;
import com.rcarrillocruz.android.openstackdroid.model.ImageModel;
public class ImageListFragment extends CloudBrowserListFragment {
List<ImageModel> images;

View File

@ -27,6 +27,10 @@ import android.app.LoaderManager;
import android.content.CursorLoader;
import com.google.gson.Gson;
import com.rcarrillocruz.android.openstackdroid.CloudControllerResultReceiver.Receiver;
import com.rcarrillocruz.android.openstackdroid.json.identity.EndpointObject;
import com.rcarrillocruz.android.openstackdroid.json.identity.GetTokenResponse;
import com.rcarrillocruz.android.openstackdroid.json.identity.RoleObject;
import com.rcarrillocruz.android.openstackdroid.json.identity.ServiceCatalogObject;
public class LoginActivity extends ListActivity implements Receiver, LoaderManager.LoaderCallbacks<Cursor> {
private static final String COMPUTE_ENDPOINT = "compute";

View File

@ -2,6 +2,9 @@ package com.rcarrillocruz.android.openstackdroid;
import java.util.Iterator;
import com.rcarrillocruz.android.openstackdroid.model.IPAddressModel;
import com.rcarrillocruz.android.openstackdroid.model.ServerModel;
import android.app.Fragment;
import android.os.Bundle;
import android.util.TypedValue;

View File

@ -6,6 +6,11 @@ import java.util.List;
import com.google.gson.Gson;
import com.rcarrillocruz.android.openstackdroid.CloudControllerResultReceiver.Receiver;
import com.rcarrillocruz.android.openstackdroid.json.compute.GetServersResponse;
import com.rcarrillocruz.android.openstackdroid.json.compute.IPAddressObject;
import com.rcarrillocruz.android.openstackdroid.json.compute.ServerDetailsObject;
import com.rcarrillocruz.android.openstackdroid.model.IPAddressModel;
import com.rcarrillocruz.android.openstackdroid.model.ServerModel;
import android.app.FragmentTransaction;
import android.app.ListFragment;

View File

@ -1,5 +1,7 @@
package com.rcarrillocruz.android.openstackdroid;
import com.rcarrillocruz.android.openstackdroid.model.TenantModel;
import android.app.Fragment;
import android.os.Bundle;
import android.util.TypedValue;

View File

@ -12,6 +12,9 @@ import android.widget.ArrayAdapter;
import android.widget.ListView;
import com.google.gson.Gson;
import com.rcarrillocruz.android.openstackdroid.json.identity.GetTenantsResponse;
import com.rcarrillocruz.android.openstackdroid.json.identity.TenantDetailsObject;
import com.rcarrillocruz.android.openstackdroid.model.TenantModel;
public class TenantListFragment extends CloudBrowserListFragment {

View File

@ -1,5 +1,7 @@
package com.rcarrillocruz.android.openstackdroid;
import com.rcarrillocruz.android.openstackdroid.model.UserModel;
import android.app.Fragment;
import android.os.Bundle;
import android.util.TypedValue;

View File

@ -12,6 +12,9 @@ import android.widget.ArrayAdapter;
import android.widget.ListView;
import com.google.gson.Gson;
import com.rcarrillocruz.android.openstackdroid.json.identity.GetUsersResponse;
import com.rcarrillocruz.android.openstackdroid.json.identity.UserDetailsObject;
import com.rcarrillocruz.android.openstackdroid.model.UserModel;
public class UserListFragment extends CloudBrowserListFragment {

View File

@ -1,5 +1,7 @@
package com.rcarrillocruz.android.openstackdroid;
import com.rcarrillocruz.android.openstackdroid.model.VolumeModel;
import android.app.Fragment;
import android.os.Bundle;
import android.util.TypedValue;

View File

@ -5,6 +5,9 @@ import java.util.Iterator;
import java.util.List;
import com.google.gson.Gson;
import com.rcarrillocruz.android.openstackdroid.json.volume.GetVolumesResponse;
import com.rcarrillocruz.android.openstackdroid.json.volume.VolumeDetailsObject;
import com.rcarrillocruz.android.openstackdroid.model.VolumeModel;
import android.app.FragmentTransaction;
import android.app.ListFragment;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.compute;
import java.util.List;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.compute;
public class FlavorLinkObject {
private String href;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.compute;
import java.util.List;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.compute;
import java.util.List;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.compute;
import java.util.List;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.compute;
public class IPAddressObject {
private String addr;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.compute;
import java.util.List;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.compute;
public class ImageLinkObject {
private String href;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.compute;
import java.util.List;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.compute;
public class LinkObject {
private String href;

View File

@ -1,4 +1,5 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.compute;
public class ServerDetailsObject {
private String id;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.compute;
public class ServerLinkObject {
private String href;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.identity;
import java.util.List;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.identity;
public class AuthObject {

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.identity;
public class EndpointObject {
private String adminURL;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.identity;
import java.util.List;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.identity;
public class GetTokenRequest {

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.identity;
public class GetTokenResponse {
private AccessObject access;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.identity;
import java.util.List;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.identity;
import java.util.List;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.identity;
public class PasswordCredentialsObject {
private String username;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.identity;
public class RoleObject {
private String name;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.identity;
import java.util.List;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.identity;
public class TenantDetailsObject {
private String id;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.identity;
public class TenantObject {
private String id;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.identity;
public class TokenObject {
private String id;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.identity;
public class UserDetailsObject {
private String id;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.identity;
import java.util.List;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.image;
import java.util.List;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.image;
public class ImageDetailsObject {
private String checksum;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.volume;
import java.util.List;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.volume;
public class VolumeAttachmentObject {
private String id;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.json.volume;
import java.util.List;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.model;
public class FlavorModel {
private String id;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.model;
public class IPAddressModel {
private String addr;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.model;
public class ImageModel {
private String id;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.model;
import java.util.List;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.model;
public class TenantModel {
private String id;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.model;
public class UserModel {
private String id;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.model;
public class VolumeModel {
private String id;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.operations;
import org.apache.http.client.methods.HttpRequestBase;

View File

@ -1,8 +1,10 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.operations.compute;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpRequestBase;
import com.rcarrillocruz.android.openstackdroid.operations.ApiOperation;
import android.net.Uri;
import android.os.Bundle;

View File

@ -1,8 +1,10 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.operations.compute;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpRequestBase;
import com.rcarrillocruz.android.openstackdroid.operations.ApiOperation;
import android.net.Uri;
import android.os.Bundle;

View File

@ -1,8 +1,10 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.operations.identity;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpRequestBase;
import com.rcarrillocruz.android.openstackdroid.operations.ApiOperation;
import android.net.Uri;
import android.os.Bundle;

View File

@ -1,4 +1,4 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.operations.identity;
import java.io.UnsupportedEncodingException;
@ -10,6 +10,10 @@ import android.net.Uri;
import android.os.Bundle;
import com.google.gson.Gson;
import com.rcarrillocruz.android.openstackdroid.json.identity.AuthObject;
import com.rcarrillocruz.android.openstackdroid.json.identity.GetTokenRequest;
import com.rcarrillocruz.android.openstackdroid.json.identity.PasswordCredentialsObject;
import com.rcarrillocruz.android.openstackdroid.operations.ApiOperation;
public class GetTokenOperation implements ApiOperation {
private Gson gson;

View File

@ -1,8 +1,10 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.operations.identity;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpRequestBase;
import com.rcarrillocruz.android.openstackdroid.operations.ApiOperation;
import android.net.Uri;
import android.os.Bundle;

View File

@ -1,8 +1,10 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.operations.image;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpRequestBase;
import com.rcarrillocruz.android.openstackdroid.operations.ApiOperation;
import android.net.Uri;
import android.os.Bundle;

View File

@ -1,8 +1,10 @@
package com.rcarrillocruz.android.openstackdroid;
package com.rcarrillocruz.android.openstackdroid.operations.volume;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpRequestBase;
import com.rcarrillocruz.android.openstackdroid.operations.ApiOperation;
import android.net.Uri;
import android.os.Bundle;