In progress: [Issue 192] Console-related exceptions after installing
1.2.0.
Implemented a fix. Will mark issue as "fixed" once filer confirms it
works.
diff --git a/com.google.eclipse.protobuf.feature/feature.xml b/com.google.eclipse.protobuf.feature/feature.xml
index 483bbd5..0ea865a 100644
--- a/com.google.eclipse.protobuf.feature/feature.xml
+++ b/com.google.eclipse.protobuf.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="com.google.eclipse.protobuf"
label="%featureName"
- version="1.2.0.qualifier"
+ version="1.2.1.qualifier"
provider-name="%providerName">
<description url="https://code.google.com/p/protobuf-dt/">
@@ -30,6 +30,8 @@
<import plugin="org.apache.log4j"/>
<import plugin="org.apache.commons.logging"/>
<import plugin="org.eclipse.xtext.ui"/>
+ <import plugin="org.eclipse.ui.editors" version="3.7.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.ui.ide" version="3.7.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.ui.shared"/>
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.xtext.builder"/>
@@ -38,11 +40,9 @@
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.eclipse.core.filesystem" version="1.3.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.compare.core" version="3.5.200" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ui.workbench.texteditor"/>
- <import plugin="org.eclipse.xtext" version="2.1.1" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ui.editors" version="3.7.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ui.ide" version="3.7.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.console" version="3.5.100" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.ui.workbench.texteditor"/>
+ <import plugin="org.eclipse.xtext" version="2.2.1" match="greaterOrEqual"/>
</requires>
<plugin
diff --git a/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF b/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF
index 2a7a258..5c5cf31 100644
--- a/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF
+++ b/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.1.qualifier
Bundle-SymbolicName: com.google.eclipse.protobuf.ui; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.google.eclipse.protobuf;visibility:=reexport,
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/protoc/ConsolePrinter.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/protoc/ConsolePrinter.java
index fc0bad1..b5e9445 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/protoc/ConsolePrinter.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/protoc/ConsolePrinter.java
@@ -10,15 +10,10 @@
import static com.google.common.io.Closeables.closeQuietly;
import static com.google.eclipse.protobuf.ui.util.Workbenches.activeWorkbenchPage;
-import static org.eclipse.core.runtime.Status.OK_STATUS;
import static org.eclipse.ui.console.IConsoleConstants.ID_CONSOLE_VIEW;
-import org.eclipse.core.runtime.*;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.*;
import org.eclipse.ui.console.*;
-import org.eclipse.ui.progress.UIJob;
/**
* @author alruiz@google.com (Alex Ruiz)
@@ -26,8 +21,7 @@
class ConsolePrinter {
private static final String CONSOLE_NAME = "protoc";
- private MessageConsoleStream signalStream;
- private MessageConsoleStream outputStream;
+ private final MessageConsoleStream out;
static ConsolePrinter createAndDisplayConsole() throws PartInitException {
MessageConsole console = findConsole();
@@ -52,37 +46,18 @@
}
private ConsolePrinter(MessageConsole console) {
- signalStream = console.newMessageStream();
- outputStream = console.newMessageStream();
- UIJob job = new UIJob("Set colors in protoc console") {
- @Override public IStatus runInUIThread(IProgressMonitor monitor) {
- Display display = getDisplay();
- signalStream.setColor(new Color(display, 0, 0, 255));
- outputStream.setColor(new Color(display, 255, 0, 0));
- return OK_STATUS;
- }
- };
- job.schedule();
+ out = console.newMessageStream();
}
void printSignal(String s) {
- signalStream.println(s);
+ out.println("[command] " + s);
}
void printOutput(String s) {
- outputStream.println(s);
+ out.println("[protoc] " + s);
}
void close() {
- close(signalStream);
- close(outputStream);
- }
-
- private static void close(MessageConsoleStream stream) {
- Color color = stream.getColor();
- if (color != null) {
- color.dispose();
- }
- closeQuietly(stream);
+ closeQuietly(out);
}
}
diff --git a/com.google.eclipse.protobuf/META-INF/MANIFEST.MF b/com.google.eclipse.protobuf/META-INF/MANIFEST.MF
index 60fc69e..fa1ee42 100644
--- a/com.google.eclipse.protobuf/META-INF/MANIFEST.MF
+++ b/com.google.eclipse.protobuf/META-INF/MANIFEST.MF
@@ -3,10 +3,10 @@
Eclipse-ExtensibleAPI: true
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.1.qualifier
Bundle-SymbolicName: com.google.eclipse.protobuf; singleton:=true
Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext;bundle-version="2.1.1",
+Require-Bundle: org.eclipse.xtext;bundle-version="2.2.1",
org.eclipse.xtext.generator;resolution:=optional,
org.eclipse.emf.codegen.ecore;resolution:=optional,
org.eclipse.emf.mwe.utils;resolution:=optional,
diff --git a/update-site/development/artifacts.jar b/update-site/development/artifacts.jar
new file mode 100644
index 0000000..2aa8f43
--- /dev/null
+++ b/update-site/development/artifacts.jar
Binary files differ
diff --git a/update-site/development/content.jar b/update-site/development/content.jar
new file mode 100644
index 0000000..0a2ef33
--- /dev/null
+++ b/update-site/development/content.jar
Binary files differ
diff --git a/update-site/development/features/com.google.eclipse.protobuf_1.2.1.201201270153.jar b/update-site/development/features/com.google.eclipse.protobuf_1.2.1.201201270153.jar
new file mode 100644
index 0000000..eda9bbb
--- /dev/null
+++ b/update-site/development/features/com.google.eclipse.protobuf_1.2.1.201201270153.jar
Binary files differ
diff --git a/update-site/development/plugins/com.google.eclipse.protobuf.ui_1.2.1.201201270153.jar b/update-site/development/plugins/com.google.eclipse.protobuf.ui_1.2.1.201201270153.jar
new file mode 100644
index 0000000..f3297f1
--- /dev/null
+++ b/update-site/development/plugins/com.google.eclipse.protobuf.ui_1.2.1.201201270153.jar
Binary files differ
diff --git a/update-site/development/plugins/com.google.eclipse.protobuf_1.2.1.201201270153.jar b/update-site/development/plugins/com.google.eclipse.protobuf_1.2.1.201201270153.jar
new file mode 100644
index 0000000..df087e9
--- /dev/null
+++ b/update-site/development/plugins/com.google.eclipse.protobuf_1.2.1.201201270153.jar
Binary files differ
diff --git a/update-site/development/site.xml b/update-site/development/site.xml
new file mode 100644
index 0000000..c028a2e
--- /dev/null
+++ b/update-site/development/site.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <description name="protobuf-dt" url="http://protobuf-dt.googlecode.com/git/update-site">
+ Update site for protobuf-dt, an Eclipse-based Development Environment for Protocol Buffers.
+ </description>
+ <feature url="features/com.google.eclipse.protobuf_1.2.1.201201270153.jar" id="com.google.eclipse.protobuf" version="1.2.1.201201270153">
+ <category name="google"/>
+ </feature>
+ <category-def name="google" label="Google"/>
+</site>
