From 3f8275d1584fbea54bdcabe0c083859b7965fc92 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Tue, 10 Apr 2012 14:45:05 +0200
Subject: [PATCH] updates

---
 .../AndroidManifest.xml                       |  1 -
 .../res/layout/main.xml                       | 25 ++++++++---------
 .../res/menu/mainmenu.xml                     | 27 -------------------
 .../android/socialapp/OverviewActivity.java   | 15 +++++------
 de.vogella.xml.jaxb/bookstore-jaxb.xml        |  4 +--
 .../src/de/vogella/xml/jaxb/model/Book.java   |  2 +-
 de.vogella.xml.jaxb/src/test/BookMain.java    | 17 ++++--------
 7 files changed, 26 insertions(+), 65 deletions(-)

diff --git a/de.vogella.android.socialapp/AndroidManifest.xml b/de.vogella.android.socialapp/AndroidManifest.xml
index fa720513b..cb3716ec8 100644
--- a/de.vogella.android.socialapp/AndroidManifest.xml
+++ b/de.vogella.android.socialapp/AndroidManifest.xml
@@ -9,7 +9,6 @@
     <application
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name" 
-        android:uiOptions="splitActionBarWhenNarrow"
         >
         <activity
             android:label="@string/app_name"
diff --git a/de.vogella.android.socialapp/res/layout/main.xml b/de.vogella.android.socialapp/res/layout/main.xml
index 9f62020a2..0709f849f 100644
--- a/de.vogella.android.socialapp/res/layout/main.xml
+++ b/de.vogella.android.socialapp/res/layout/main.xml
@@ -2,32 +2,29 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@drawable/fire"
     android:orientation="vertical" >
 
     <LinearLayout
-        android:id="@+id/layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" >
+        style="?android:attr/buttonBarStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
 
         <Button
             android:id="@+id/Button01"
-            android:layout_width="wrap_content"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="Show" >
-        </Button>
+            android:layout_weight="1"
+            android:text="Show" />
 
         <Button
             android:id="@+id/Button02"
-            android:layout_width="wrap_content"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:text="Change" />
-
     </LinearLayout>
 
-    <CalendarView
-        android:id="@+id/calendarView1"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/de.vogella.android.socialapp/res/menu/mainmenu.xml b/de.vogella.android.socialapp/res/menu/mainmenu.xml
index 9ab9ebaf4..3921977ac 100644
--- a/de.vogella.android.socialapp/res/menu/mainmenu.xml
+++ b/de.vogella.android.socialapp/res/menu/mainmenu.xml
@@ -1,37 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
-	 <item
-	     android:id="@+id/menu_share"
-	     android:actionProviderClass="android.widget.ShareActionProvider"
-	     android:showAsAction="ifRoom"
-	     android:title="Share"/>
-
     <item
         android:id="@+id/preferences"
         android:showAsAction="ifRoom"
         android:title="Prefs">
     </item>
-    <item
-        android:id="@+id/preferences2"
-        android:showAsAction="ifRoom"
-        android:title="More">
-    </item>
-    <item
-        android:id="@+id/preferences3"
-        android:title="Internet">
-    </item>
-    <item
-        android:id="@+id/preferences4"
-        android:title="Take Picture">
-    </item>
-    <item
-        android:id="@+id/preferences5"
-        android:title="Share with others">
-    </item>
-    <item
-        android:id="@+id/preferences6"
-        android:title="Time">
-    </item>
 
 </menu>
\ No newline at end of file
diff --git a/de.vogella.android.socialapp/src/de/vogella/android/socialapp/OverviewActivity.java b/de.vogella.android.socialapp/src/de/vogella/android/socialapp/OverviewActivity.java
index 5427ac336..9c516377d 100644
--- a/de.vogella.android.socialapp/src/de/vogella/android/socialapp/OverviewActivity.java
+++ b/de.vogella.android.socialapp/src/de/vogella/android/socialapp/OverviewActivity.java
@@ -13,7 +13,6 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
-import android.widget.ShareActionProvider;
 import android.widget.Toast;
 
 public class OverviewActivity extends Activity {
@@ -74,13 +73,13 @@ private void updatePreferenceValue() {
 	public boolean onCreateOptionsMenu(Menu menu) {
 		MenuInflater inflater = getMenuInflater();
 		inflater.inflate(R.menu.mainmenu, menu);
-		MenuItem item = menu.findItem(R.id.menu_share);
-		ShareActionProvider provider = (ShareActionProvider) item
-				.getActionProvider();
-		Intent intent = new Intent(Intent.ACTION_SEND);
-		intent.setType("plain/text");
-		intent.putExtra(Intent.EXTRA_TEXT, "Hello");
-		provider.setShareIntent(intent);
+		// MenuItem item = menu.findItem(R.id.menu_share);
+		// ShareActionProvider provider = (ShareActionProvider) item
+		// .getActionProvider();
+		// Intent intent = new Intent(Intent.ACTION_SEND);
+		// intent.setType("plain/text");
+		// intent.putExtra(Intent.EXTRA_TEXT, "Hello");
+		// provider.setShareIntent(intent);
 		return true;
 	}
 
diff --git a/de.vogella.xml.jaxb/bookstore-jaxb.xml b/de.vogella.xml.jaxb/bookstore-jaxb.xml
index 1e3bc5f66..d3ddbdedf 100644
--- a/de.vogella.xml.jaxb/bookstore-jaxb.xml
+++ b/de.vogella.xml.jaxb/bookstore-jaxb.xml
@@ -3,13 +3,13 @@
     <bookList>
         <book>
             <author>Neil Strauss</author>
-            <bookName>The Game</bookName>
+            <title>The Game</title>
             <publisher>Harpercollins</publisher>
             <isbn>978-0060554736</isbn>
         </book>
         <book>
             <author>Charlotte Roche</author>
-            <bookName>Feuchtgebiete</bookName>
+            <title>Feuchtgebiete</title>
             <publisher>Dumont Buchverlag</publisher>
             <isbn>978-3832180577</isbn>
         </book>
diff --git a/de.vogella.xml.jaxb/src/de/vogella/xml/jaxb/model/Book.java b/de.vogella.xml.jaxb/src/de/vogella/xml/jaxb/model/Book.java
index c821585f9..d337cf5b8 100644
--- a/de.vogella.xml.jaxb/src/de/vogella/xml/jaxb/model/Book.java
+++ b/de.vogella.xml.jaxb/src/de/vogella/xml/jaxb/model/Book.java
@@ -17,7 +17,7 @@ public class Book {
 
 	// If you like the variable name, e.g. "name", you can easily change this
 	// name for your XML-Output:
-	@XmlElement(name = "bookName")
+	@XmlElement(name = "title")
 	public String getName() {
 		return name;
 	}
diff --git a/de.vogella.xml.jaxb/src/test/BookMain.java b/de.vogella.xml.jaxb/src/test/BookMain.java
index b1be4cf94..11344292f 100644
--- a/de.vogella.xml.jaxb/src/test/BookMain.java
+++ b/de.vogella.xml.jaxb/src/test/BookMain.java
@@ -1,9 +1,8 @@
 package test;
 
+import java.io.File;
 import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
-import java.io.Writer;
 import java.util.ArrayList;
 
 import javax.xml.bind.JAXBContext;
@@ -47,18 +46,12 @@ public static void main(String[] args) throws JAXBException, IOException {
 		JAXBContext context = JAXBContext.newInstance(Bookstore.class);
 		Marshaller m = context.createMarshaller();
 		m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+
+		// Write to System.out
 		m.marshal(bookstore, System.out);
 
-		Writer w = null;
-		try {
-			w = new FileWriter(BOOKSTORE_XML);
-			m.marshal(bookstore, w);
-		} finally {
-			try {
-				w.close();
-			} catch (Exception e) {
-			}
-		}
+		// Write to File
+		m.marshal(bookstore, new File(BOOKSTORE_XML));
 
 		// get variables from our xml file, created before
 		System.out.println();