Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit 905716b7fa7add334c799c1451bc277425fea47a 2 parents ee49a7c + 790880b
@Shalom Shalom authored
View
16 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 });
}
/**
View
2  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
Please sign in to comment.
Something went wrong with that request. Please try again.