updates

vogella · vogella · commit c1ed0823073c · 2012-12-11T15:25:25.000+01:00
diff --git a/de.vogella.android.todos/src/de/vogella/android/todos/TodosOverviewActivity.java b/de.vogella.android.todos/src/de/vogella/android/todos/TodosOverviewActivity.java
@@ -82,7 +82,7 @@ public boolean onContextItemSelected(MenuItem item) {
 
 	private void createTodo() {
 		Intent i = new Intent(this, TodoDetailActivity.class);
-		startActivityForResult(i, ACTIVITY_CREATE);
+		startActivity(i, ACTIVITY_CREATE);
 	}
 
 	// Opens the second activity if an entry is clicked
@@ -94,18 +94,9 @@ protected void onListItemClick(ListView l, View v, int position, long id) {
 		i.putExtra(MyTodoContentProvider.CONTENT_ITEM_TYPE, todoUri);
 
 		// Activity returns an result if called with startActivityForResult
-		startActivityForResult(i, ACTIVITY_EDIT);
+		startActivity(i, ACTIVITY_EDIT);
 	}
 
-	// Called with the result of the other activity
-	// requestCode was the origin request code send to the activity
-	// resultCode is the return code, 0 is everything is ok
-	// intend can be used to get data
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode,
-			Intent intent) {
-		super.onActivityResult(requestCode, resultCode, intent);
-	}
 
 	private void fillData() {
 
diff --git a/de.vogella.camera.api/src/de/vogella/camera/api/MakePhotoActivity.java b/de.vogella.camera.api/src/de/vogella/camera/api/MakePhotoActivity.java
@@ -26,10 +26,11 @@ public void onCreate(Bundle savedInstanceState) {
 					.show();
 		} else {
 			cameraId = findFrontFacingCamera();
-			camera = Camera.open(cameraId);
 			if (cameraId < 0) {
 				Toast.makeText(this, "No front facing camera found.",
 						Toast.LENGTH_LONG).show();
+			} else {
+				camera = Camera.open(cameraId);
 			}
 		}
 	}
diff --git a/de.vogella.databinding.windowbuilder.example/src/phonebook/PhoneBook.java b/de.vogella.databinding.windowbuilder.example/src/phonebook/PhoneBook.java
@@ -338,11 +338,11 @@ protected DataBindingContext initDataBindings() {
 		m_groupViewer.setLabelProvider(new ObservableMapLabelProvider(observeMap));
 		m_groupViewer.setContentProvider(listContentProvider);
 		//
-		IObservableList selfList = Properties.selfList(PhoneGroup.class).observe(m_groups.getGroups());
-		m_groupViewer.setInput(selfList);
+		IObservableList groupsGroupsObserveList = BeanProperties.list("groups").observe(m_groups);
+		m_groupViewer.setInput(groupsGroupsObserveList);
 		//
 		ObservableListContentProvider listContentProvider_1 = new ObservableListContentProvider();
-		IObservableMap[] observeMaps = BeansObservables.observeMaps(listContentProvider_1.getKnownElements(), Person.class, new String[]{"name", "phone", "mobilePhone2", "mobilePhone1", "email"});
+		IObservableMap[] observeMaps = BeansObservables.observeMaps(listContentProvider_1.getKnownElements(), Person.class, new String[]{"name", "email", "phone", "mobilePhone2", "mobilePhone1"});
 		m_personViewer.setLabelProvider(new ObservableMapLabelProvider(observeMaps));
 		m_personViewer.setContentProvider(listContentProvider_1);
 		//
@@ -355,6 +355,11 @@ protected DataBindingContext initDataBindings() {
 		IObservableValue personViewerNameObserveDetailValue = BeanProperties.value(Person.class, "name", String.class).observeDetail(observeSingleSelectionPersonViewer);
 		bindingContext.bindValue(observeTextNameTextObserveWidget, personViewerNameObserveDetailValue, null, null);
 		//
+		IObservableValue observeTextEmailTextObserveWidget = WidgetProperties.text(SWT.Modify).observe(m_emailText);
+		IObservableValue observeSingleSelectionPersonViewer_1 = ViewerProperties.singleSelection().observe(m_personViewer);
+		IObservableValue personViewerEmailObserveDetailValue = BeanProperties.value(Person.class, "email", String.class).observeDetail(observeSingleSelectionPersonViewer_1);
+		bindingContext.bindValue(observeTextEmailTextObserveWidget, personViewerEmailObserveDetailValue, null, null);
+		//
 		return bindingContext;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,11 @@ public void onCreate(Bundle savedInstanceState) {`
`26`	`26`	`.show();`
`27`	`27`	`} else {`
`28`	`28`	`cameraId = findFrontFacingCamera();`
`29`		`- camera = Camera.open(cameraId);`
`30`	`29`	`if (cameraId < 0) {`
`31`	`30`	`Toast.makeText(this, "No front facing camera found.",`
`32`	`31`	`Toast.LENGTH_LONG).show();`
	`32`	`+ } else {`
	`33`	`+ camera = Camera.open(cameraId);`
`33`	`34`	`}`
`34`	`35`	`}`
`35`	`36`	`}`