Merge branch 'release' of github.com:aptana/studio3 into release

aptana · Apr 27, 2012 · 905716b · 905716b
2 parents ee49a7c + 790880b
commit 905716b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/plugins/com.aptana.core/src/com/aptana/core/logging/IdeLog.java b/plugins/com.aptana.core/src/com/aptana/core/logging/IdeLog.java
@@ -610,11 +610,17 @@ public static String buildMessage(Plugin plugin, int severity, String message, S
 			scope = StringUtil.EMPTY;
 		}
 
-		String tempMessage = StringUtil.format(
-				"(Build {0}) {1} {2} {3}", new String[] { EclipseUtil.getPluginVersion(plugin), //$NON-NLS-1$
-						getLabel(severity), scope, message });
-
-		return tempMessage;
+		String version;
+		if (EclipseUtil.isStandalone())
+		{
+			version = EclipseUtil.getProductVersion();
+		}
+		else
+		{
+			version = EclipseUtil.getStudioVersion();
+		}
+		return StringUtil.format("(Build {0}) {1} {2} {3}", //$NON-NLS-1$
+				new String[] { version, getLabel(severity), scope, message });
 	}
 
 	/**

diff --git a/plugins/com.aptana.eclipse.fullscreen.ui/META-INF/MANIFEST.MF b/plugins/com.aptana.eclipse.fullscreen.ui/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.expressions
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.4.201108061054
+Bundle-Version: 1.0.4.qualifier
 Eclipse-PlatformFilter: (&(osgi.os=macosx)(osgi.ws=cocoa))
 Bundle-Name: %Bundle-Name
 Bundle-Activator: com.aptana.eclipse.fullscreen.ui.Activator