Fixed options menu in fragments to follow proper calling procedure, s…

…o it is always updated. Updated gitignore to include IntelliJIDEA files.

.gitignore

@@ -44,3 +44,7 @@ local.properties
 
 # PDT-specific
 .buildpath
+
+# IntelliJ files
+.idea
+*.iml

PTTestProjectTest/src/com/lateensoft/pathfinder/toolkit/test/db/repository/PTCharacterRepositoryTest.java

@@ -36,7 +36,7 @@ public void testQuery() {
 
 	public void testQueryList() {
 		List<Entry<Long, String>> names = m_repo.queryList();
-		assertEquals(names.get(0).getValue(), m_char1.getName());
-		assertEquals(names.get(1).getValue(), CHARACTER_NAME);
+		assertEquals(m_char1.getName(), names.get(0).getValue());
+		assertEquals(CHARACTER_NAME, names.get(1).getValue());
 	}
 }

pathfinder-toolkit/res/values/strings.xml

@@ -9,10 +9,9 @@
     <string name="title_activity_party_manager">Party Manager</string>
     <string name="title_activity_party_member_editor">Party Member Editor</string>
     <string name="title_activity_settings">Settings</string>
-    <string name="auto_fill">Autofill</string>
-
-    <string name="autofill_toast_text">Character stats autofilled</string>
-
+
+    <string name="updating_dialog_message">Updating…</string>
+
     <string name="main_menu_icons_description">Icon for main menu item</string>
 
     <!-- Global menu item strings -->

pathfinder-toolkit/src/com/lateensoft/pathfinder/toolkit/PTMainActivity.java

@@ -62,8 +62,6 @@ public class PTMainActivity extends Activity implements
 	private ActionBarDrawerToggle m_drawerToggle;
 	private ExpandableListView m_drawerList;
 
-	private OnBackStackChangedListener m_backstackListener;
-
 	private PTBasePageFragment m_currentFragment;
 	private long m_currentFragmentId = 0;
 
@@ -76,13 +74,6 @@ public void onCreate(Bundle savedInstanceState) {
 		}
 
 		setContentView(R.layout.activity_drawer_main);
-		m_backstackListener = new OnBackStackChangedListener() {
-
-			@Override public void onBackStackChanged() {
-				invalidateOptionsMenu();
-			}
-		};
-		getFragmentManager().addOnBackStackChangedListener(m_backstackListener);
 
 		setupNavDrawer();
 
@@ -95,7 +86,7 @@ public void onCreate(Bundle savedInstanceState) {
 			final ProgressDialog progDialog = new ProgressDialog(this);
 			progDialog.setCancelable(false);
 			progDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
-			progDialog.setTitle("Updating...");
+			progDialog.setTitle(getString(R.string.updating_dialog_message));
 			progDialog.show();
 
 			PatcherTask task = new PatcherTask();
@@ -191,12 +182,8 @@ public void showRateAppPromptDialog() {
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
-		if (m_currentFragment != null) {
-			m_currentFragment.onCreateOptionsMenu(menu);
-		}
-
 		// Add menu items which are visible for all fragments
-		PTSharedMenu.onCreateOptionsMenu(menu, this);
+		PTSharedMenu.onCreateOptionsMenu(menu, getMenuInflater());
 		return true;
 	}
 
@@ -220,16 +207,12 @@ public boolean onOptionsItemSelected(MenuItem item) {
 			}
 		}
 
-		if (PTSharedMenu.onOptionsItemSelected(item, this) == false) {
-			if (m_currentFragment != null) {
-				m_currentFragment.onOptionsItemSelected(item);
-			}
-		}
-
+		PTSharedMenu.onOptionsItemSelected(item, this);
 		return super.onOptionsItemSelected(item);
 	}
 
 	// For dialog
+    @Override
 	public void onClick(DialogInterface dialogInterface, int selection) {
 		PTSharedPreferences sharedPrefs = PTSharedPreferences.getInstance();
 

pathfinder-toolkit/src/com/lateensoft/pathfinder/toolkit/PTSharedMenu.java

@@ -1,5 +1,6 @@
 package com.lateensoft.pathfinder.toolkit;
 
+import android.view.MenuInflater;
 import com.lateensoft.pathfinder.toolkit.views.settings.PTSettingsActivity;
 
 import android.app.Activity;
@@ -9,8 +10,8 @@
 
 public class PTSharedMenu {
 
-	public static void onCreateOptionsMenu(Menu menu, Activity activity) {
-		activity.getMenuInflater().inflate(R.menu.shared_menu, menu);
+	public static void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+		inflater.inflate(R.menu.shared_menu, menu);
 	}
 
 	public static boolean onOptionsItemSelected(MenuItem item, Activity activity) {

pathfinder-toolkit/src/com/lateensoft/pathfinder/toolkit/views/PTBasePageFragment.java

@@ -1,5 +1,6 @@
 package com.lateensoft.pathfinder.toolkit.views;
 
+import android.os.Bundle;
 import com.lateensoft.pathfinder.toolkit.PTMainActivity;
 
 import android.app.Activity;
@@ -13,23 +14,21 @@ public class PTBasePageFragment extends Fragment{
 
 	private View m_rootView;
 
-	@Override
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
 	public void onResume() {
 		super.onResume();
 		Activity a = getActivity();
 		if (a instanceof PTMainActivity) {
 			((PTMainActivity) a).hideKeyboardDelayed(100);
 		}
 	}
-
-	public boolean onCreateOptionsMenu(Menu menu) {		
-		return true;
-	}
-
-	public boolean onOptionsItemSelected(MenuItem item) {
-		return false;
-	}
-
+
 	public void setTitle(String title) {
 		getActivity().getActionBar().setTitle(title);
 	}

pathfinder-toolkit/src/com/lateensoft/pathfinder/toolkit/views/PTPointbuyCalculatorFragment.java

@@ -144,17 +144,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
 		return getRootView();
 	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		MenuInflater inflater = getMenuInflater();
-		if (inflater != null) {
-			inflater.inflate(R.menu.pointbuy_menu, menu);
-		}
-
-		super.onCreateOptionsMenu(menu);
-		return true;
-	}
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.pointbuy_menu, menu);
+        super.onCreateOptionsMenu(menu, inflater);
+    }
 
 	private class RaceItemSelectedListener implements OnItemSelectedListener {
 		@Override public void onItemSelected(AdapterView<?> parent, View view, 

pathfinder-toolkit/src/com/lateensoft/pathfinder/toolkit/views/character/PTCharacterSheetFragment.java

@@ -179,14 +179,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
 	}
 
 	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		MenuInflater inflater = getMenuInflater();
-		if (inflater != null) {
-			inflater.inflate(R.menu.character_sheet_menu, menu);
-		}
-
-		super.onCreateOptionsMenu(menu);
-		return true;
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+		inflater.inflate(R.menu.character_sheet_menu, menu);
+		super.onCreateOptionsMenu(menu, inflater);
 	}
 
 	private void showCharacterDialog() {

pathfinder-toolkit/src/com/lateensoft/pathfinder/toolkit/views/party/PTInitiativeTrackerFragment.java

@@ -94,18 +94,13 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
 	}
 
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		MenuInflater inflater = getMenuInflater();
-		if (inflater != null) {
-			inflater.inflate(R.menu.initiative_tracker_menu, menu);
-		}
-
-		super.onCreateOptionsMenu(menu);
-		return true;
-	}
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.initiative_tracker_menu, menu);
+        super.onCreateOptionsMenu(menu, inflater);
+    }
 
-	private void showPartyDialog() {
+    private void showPartyDialog() {
 
 		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
 
@@ -237,9 +232,7 @@ private void refreshPartyView() {
 
 	/**
 	 * launches the party member editor
-	 * 
-	 * @param index
-	 *            (the actual index, not the roll value index)
+	 * @param member the member to send to the editor
 	 */
 	private void showPartyMemberEditor(PTPartyMember member) {
 		Intent intent = new Intent(getActivity(),

pathfinder-toolkit/src/com/lateensoft/pathfinder/toolkit/views/party/PTPartyManagerFragment.java

@@ -200,18 +200,13 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
 	}
 
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		MenuInflater inflater = getMenuInflater();
-		if (inflater != null) {
-			inflater.inflate(R.menu.party_manager_menu, menu);
-		}
-
-		super.onCreateOptionsMenu(menu);
-		return true;
-	}
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.party_manager_menu, menu);
+        super.onCreateOptionsMenu(menu, inflater);
+    }
 
-	private void showPartyDialog() {
+    private void showPartyDialog() {
 		m_partyIDSelectedInDialog = m_party.getID(); // actual current party
 
 		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());