Merge branch 'master' into Tree_expand

Author: jukzi

bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/utils/ClassUtils.java

@@ -35,11 +35,7 @@ public static String getSimpleName(Class<?> c) {
 	 * Return the package name of Class <code>c</code>.
 	 */
 	public static String getPackageName(Class<?> c) {
-		String name = c.getName();
-		int index = name.lastIndexOf('.');
-		if (index > 0) {
-			return name.substring(0, index);
-		}
-		return null;
+		Package p = c.getPackage();
+		return p == null ? null : p.getName();
 	}
 }

bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/WizardNewFolderMainPage.java

@@ -62,13 +62,15 @@
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Resource;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Widget;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.ide.dialogs.UIResourceFilterDescription;
@@ -605,22 +607,32 @@ public void dispose() {
 	}
 
 	private void disposeAdvancedControls() {
-		if (linkedResourceComposite != null) {
-			linkedResourceComposite.dispose();
-			linkedResourceComposite = null;
-			filterButton.dispose();
-			useDefaultLocation.dispose();
-			useVirtualFolder.dispose();
-			useLinkedResource.dispose();
-			linkedGroupComposite.dispose();
-			folderImage.dispose();
-			virtualFolderImage.dispose();
-			linkedFolderImage.dispose();
-			filterButton = null;
-			useDefaultLocation = null;
-			useVirtualFolder = null;
-			useLinkedResource = null;
-			linkedGroupComposite = null;
+		dispose(linkedResourceComposite);
+		dispose(filterButton);
+		dispose(useDefaultLocation);
+		dispose(useVirtualFolder);
+		dispose(useLinkedResource);
+		dispose(linkedGroupComposite);
+		dispose(folderImage);
+		dispose(virtualFolderImage);
+		dispose(linkedFolderImage);
+		linkedResourceComposite = null;
+		filterButton = null;
+		useDefaultLocation = null;
+		useVirtualFolder = null;
+		useLinkedResource = null;
+		linkedGroupComposite = null;
+	}
+
+	private void dispose(Resource resource) {
+		if (resource != null) {
+			resource.dispose();
+		}
+	}
+
+	private void dispose(Widget widget) {
+		if (widget != null) {
+			widget.dispose();
 		}
 	}