From 1816bdd1965a8395e8878462e5c7693591327888 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 16 Dec 2014 11:41:07 +0100 Subject: android: Adpater -> Adapter Change-Id: If5297d641b4a596f20bdde8203f199d8efcb92fe --- .../libreoffice/DocumentPartViewListAdapter.java | 45 ++++++++++++++++++++++ .../libreoffice/DocumentPartViewListAdpater.java | 45 ---------------------- .../java/org/libreoffice/LOKitTileProvider.java | 2 +- .../org/libreoffice/LibreOfficeMainActivity.java | 14 +++---- .../src/java/org/libreoffice/MockTileProvider.java | 4 +- 5 files changed, 55 insertions(+), 55 deletions(-) create mode 100644 android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdapter.java delete mode 100644 android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdpater.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdapter.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdapter.java new file mode 100644 index 000000000000..d25cccb0e46e --- /dev/null +++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdapter.java @@ -0,0 +1,45 @@ +package org.libreoffice; + +import android.app.Activity; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ArrayAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import java.util.List; + +public class DocumentPartViewListAdapter extends ArrayAdapter { + private static final String LOGTAG = DocumentPartViewListAdapter.class.getSimpleName(); + + private final Activity activity; + + public DocumentPartViewListAdapter(Activity activity, int resource, List objects) { + super(activity, resource, objects); + this.activity = activity; + } + + @Override + public View getView(int position, View view, ViewGroup parent) { + if (view == null) { + LayoutInflater layoutInflater = activity.getLayoutInflater(); + view = layoutInflater.inflate(R.layout.document_part_list_layout, null); + } + + DocumentPartView documentPartView = getItem(position); + TextView textView = (TextView) view.findViewById(R.id.text); + textView.setText(documentPartView.getPartName()); + Log.i(LOGTAG, "getView - " + documentPartView.getPartName()); + + ImageView imageView = (ImageView) view.findViewById(R.id.image); + if (documentPartView.getThumbnail() != null) { + imageView.setImageBitmap(documentPartView.getThumbnail()); + } else { + imageView.setImageResource(R.drawable.writer); + } + + return view; + } +} diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdpater.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdpater.java deleted file mode 100644 index 067d44d2c2f8..000000000000 --- a/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdpater.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.libreoffice; - -import android.app.Activity; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ArrayAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import java.util.List; - -public class DocumentPartViewListAdpater extends ArrayAdapter { - private static final String LOGTAG = DocumentPartViewListAdpater.class.getSimpleName(); - - private final Activity activity; - - public DocumentPartViewListAdpater(Activity activity, int resource, List objects) { - super(activity, resource, objects); - this.activity = activity; - } - - @Override - public View getView(int position, View view, ViewGroup parent) { - if (view == null) { - LayoutInflater layoutInflater = activity.getLayoutInflater(); - view = layoutInflater.inflate(R.layout.document_part_list_layout, null); - } - - DocumentPartView documentPartView = getItem(position); - TextView textView = (TextView) view.findViewById(R.id.text); - textView.setText(documentPartView.getPartName()); - Log.i(LOGTAG, "getView - " + documentPartView.getPartName()); - - ImageView imageView = (ImageView) view.findViewById(R.id.image); - if (documentPartView.getThumbnail() != null) { - imageView.setImageBitmap(documentPartView.getThumbnail()); - } else { - imageView.setImageResource(R.drawable.writer); - } - - return view; - } -} diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java index b61c6ca5a47f..82908e1cd533 100644 --- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java +++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java @@ -91,7 +91,7 @@ public class LOKitTileProvider implements TileProvider { LOKitShell.getMainHandler().post(new Runnable() { @Override public void run() { - LibreOfficeMainActivity.mAppContext.getDocumentPartViewListAdpater().notifyDataSetChanged(); + LibreOfficeMainActivity.mAppContext.getDocumentPartViewListAdapter().notifyDataSetChanged(); } }); } diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java index 991a1533a674..ccb864b98f33 100644 --- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java +++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java @@ -40,7 +40,7 @@ public class LibreOfficeMainActivity extends Activity { private RelativeLayout mGeckoLayout; private ListView mDrawerList; private List mDocumentPartView = new ArrayList(); - private DocumentPartViewListAdpater mDocumentPartViewListAdpater; + private DocumentPartViewListAdapter mDocumentPartViewListAdapter; private String mInputFile; public static GeckoLayerClient getLayerClient() { @@ -106,11 +106,11 @@ public class LibreOfficeMainActivity extends Activity { mGeckoLayout = (RelativeLayout) findViewById(R.id.gecko_layout); mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout); - if (mDocumentPartViewListAdpater == null) { + if (mDocumentPartViewListAdapter == null) { mDrawerList = (ListView) findViewById(R.id.left_drawer); - mDocumentPartViewListAdpater = new DocumentPartViewListAdpater(this, R.layout.document_part_list_layout, mDocumentPartView); - mDrawerList.setAdapter(mDocumentPartViewListAdpater); + mDocumentPartViewListAdapter = new DocumentPartViewListAdapter(this, R.layout.document_part_list_layout, mDocumentPartView); + mDrawerList.setAdapter(mDocumentPartViewListAdapter); mDrawerList.setOnItemClickListener(new DocumentPartClickListener()); } @@ -169,8 +169,8 @@ public class LibreOfficeMainActivity extends Activity { return mDocumentPartView; } - public DocumentPartViewListAdpater getDocumentPartViewListAdpater() { - return mDocumentPartViewListAdpater; + public DocumentPartViewListAdapter getDocumentPartViewListAdapter() { + return mDocumentPartViewListAdapter; } private void showAbout() { @@ -237,7 +237,7 @@ public class LibreOfficeMainActivity extends Activity { private class DocumentPartClickListener implements android.widget.AdapterView.OnItemClickListener { @Override public void onItemClick(AdapterView parent, View view, int position, long id) { - DocumentPartView partView = mDocumentPartViewListAdpater.getItem(position); + DocumentPartView partView = mDocumentPartViewListAdapter.getItem(position); LOKitShell.sendEvent(LOEventFactory.changePart(partView.getPartIndex())); mDrawerLayout.closeDrawer(mDrawerList); } diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java index 8fd51b8ca8c6..e6070479671e 100644 --- a/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java +++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java @@ -19,12 +19,12 @@ public class MockTileProvider implements TileProvider { for (int i = 0; i < 5; i++) { String partName = "Part " + i; DocumentPartView partView = new DocumentPartView(i, partName, null); - LibreOfficeMainActivity.mAppContext.getDocumentPartViewListAdpater().add(partView); + LibreOfficeMainActivity.mAppContext.getDocumentPartViewListAdapter().add(partView); } LibreOfficeMainActivity.mAppContext.mMainHandler.post(new Runnable() { @Override public void run() { - LibreOfficeMainActivity.mAppContext.getDocumentPartViewListAdpater().notifyDataSetChanged(); + LibreOfficeMainActivity.mAppContext.getDocumentPartViewListAdapter().notifyDataSetChanged(); } }); } -- cgit