updates

vogella · vogella · commit 4c1584cd918e · 2012-01-13T17:36:45.000+01:00
diff --git a/com.example.swt.widgets/META-INF/MANIFEST.MF b/com.example.swt.widgets/META-INF/MANIFEST.MF
@@ -5,4 +5,4 @@ Bundle-SymbolicName: com.example.swt.widgets
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: EXAMPLE
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.swt;bundle-version="3.8.0"
+Require-Bundle: org.eclipse.swt
diff --git a/com.example.swt.widgets/src/com/example/swt/widgets/FirstSWTApplication.java b/com.example.swt.widgets/src/com/example/swt/widgets/FirstSWTApplication.java
@@ -25,7 +25,7 @@ public static void main(String[] args) {
 
 	private static void createUi(Display display, Shell shell) {
 		Label label = new Label(shell, SWT.BORDER);
-		label.setText("This is a lable:");
+		label.setText("This is a label:");
 		label.setToolTipText("This is the tooltip of this label");
 		Text text = new Text(shell, SWT.NONE);
 		text.setText("This is the text in the label");
diff --git a/de.vogella.jface.tableviewer/src/de/vogella/jface/tableviewer/View.java b/de.vogella.jface.tableviewer/src/de/vogella/jface/tableviewer/View.java
@@ -84,18 +84,27 @@ public void keyReleased(KeyEvent ke) {
 	}
 
 	private void createViewer(Composite parent) {
+
+		// Define the TableViewer
 		viewer = new TableViewer(parent, SWT.MULTI | SWT.H_SCROLL
 				| SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.BORDER);
-		createColumns(parent, viewer);
+
+		// Create the columns
+		createColumns(parent);
+
+		// Make lines and make header visible
 		final Table table = viewer.getTable();
 		table.setHeaderVisible(true);
 		table.setLinesVisible(true);
 
-		viewer.setContentProvider(new ArrayContentProvider());
-		// Get the content for the viewer, setInput will call getElements in the
-		// contentProvider
+		// Set the ContentProvider
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
+
+		// Get the content for the Viewer,
+		// setInput will call getElements in the ContentProvider
 		viewer.setInput(ModelProvider.INSTANCE.getPersons());
-		// Make the selection available to other views
+
+		// Make the selection available to other Views
 		getSite().setSelectionProvider(viewer);
 
 		// Layout the viewer
@@ -113,7 +122,7 @@ public TableViewer getViewer() {
 	}
 
 	// This will create the columns for the table
-	private void createColumns(final Composite parent, final TableViewer viewer) {
+	private void createColumns(final Composite parent) {
 		headerMenu = new Menu(parent.getShell(), SWT.POP_UP);
 
 		String[] titles = { "First name", "Last name", "Gender", "Married" };
@@ -186,9 +195,8 @@ public String getText(Object element) {
 			public Image getImage(Object element) {
 				if (((Person) element).isMarried()) {
 					return CHECKED;
-				} else {
-					return UNCHECKED;
 				}
+				return UNCHECKED;
 			}
 		});
 		col.setEditingSupport(new MarriedEditingSupport(viewer));
