Skip to content

Commit

Permalink
JBIDE-18955: Upgraded to Forge 2.13.0.Final
Browse files Browse the repository at this point in the history
  • Loading branch information
gastaldi committed Dec 15, 2014
1 parent 9358af9 commit f69d8d9
Show file tree
Hide file tree
Showing 5 changed files with 113 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.jboss.forge.furnace.spi.ListenerRegistration;
import org.jboss.tools.aesh.core.console.AbstractConsole;
import org.jboss.tools.forge.core.furnace.FurnaceService;
import org.jboss.tools.forge.ui.internal.ext.provider.ForgeUIDesktop;

public class AeshConsole extends AbstractConsole {

Expand Down Expand Up @@ -53,15 +54,17 @@ public void start() {
PrintStream err = new PrintStream(stdErr, true);
ShellHandleSettings settings = new ShellHandleSettings();
settings.stdOut(out).stdErr(err).stdIn(getInputStream())
.currentResource(currentDir).terminal(terminal);
.currentResource(currentDir).terminal(terminal)
.desktop(new ForgeUIDesktop());
handle.initialize(settings);
handle.addCommandExecutionListener(executionListener);
// Listening for selection events
handle.addCommandExecutionListener(new AbstractCommandExecutionListener() {
@Override
public void postCommandExecuted(UICommand command,
UIExecutionContext context, Result result) {
currentResource = (Resource<?>) context.getUIContext().getSelection().get();
currentResource = (Resource<?>) context.getUIContext()
.getSelection().get();
}
});

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
/**
* Copyright 2014 Red Hat, Inc. and/or its affiliates.
*
* Licensed under the Eclipse Public License version 1.0, available at
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.jboss.tools.forge.ui.internal.ext.provider;

import java.io.File;
import java.io.IOException;
import java.net.URI;

import org.eclipse.core.filesystem.EFS;
import org.eclipse.core.filesystem.IFileStore;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.browser.IWebBrowser;
import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
import org.eclipse.ui.ide.IDE;
import org.jboss.forge.addon.ui.DefaultUIDesktop;
import org.jboss.forge.addon.ui.UIDesktop;
import org.jboss.tools.forge.ui.internal.ForgeUIPlugin;

/**
* Implementation of the {@link UIDesktop} interface
*
* @author <a href="ggastald@redhat.com">George Gastaldi</a>
*/
public class ForgeUIDesktop extends DefaultUIDesktop {

@Override
public void open(File file) throws IOException {
// Open should do the same as edit in Eclipse
edit(file);
}

@Override
public void edit(File file) throws IOException {
final IFileStore fileStore = EFS.getLocalFileSystem().getStore(
file.toURI());
IWorkbench workbench = PlatformUI.getWorkbench();
IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
if (window == null) {
window = workbench.getWorkbenchWindows()[0];
}
final IWorkbenchPage page = window.getActivePage();
Display.getDefault().syncExec(new Runnable() {
@Override
public void run() {
try {
IDE.openEditorOnFileStore(page, fileStore);
} catch (PartInitException e) {
Status status = new Status(IStatus.ERROR,
ForgeUIPlugin.PLUGIN_ID, "Edit File action failed");
ForgeUIPlugin.log(e);
MessageDialog.openError(null, "Edit File",
status.getMessage());
}
}
});
}

@Override
public void browse(URI uri) throws IOException {
IWorkbenchBrowserSupport support = PlatformUI.getWorkbench()
.getBrowserSupport();
try {
IWebBrowser browser = support
.createBrowser(ForgeUIPlugin.PLUGIN_ID);
browser.openURL(uri.toURL());
} catch (PartInitException e) {
Status status = new Status(IStatus.ERROR, ForgeUIPlugin.PLUGIN_ID,
"Browser initialization failed");
ForgeUIPlugin.log(e);
MessageDialog.openError(null, "Browse URL", status.getMessage());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import org.eclipse.ui.console.IConsoleManager;
import org.eclipse.ui.console.MessageConsole;
import org.eclipse.ui.console.MessageConsoleStream;
import org.jboss.forge.addon.ui.UIDesktop;
import org.jboss.forge.addon.ui.UIProvider;
import org.jboss.forge.addon.ui.output.UIOutput;
import org.jboss.tools.forge.core.furnace.FurnaceRuntime;
Expand Down Expand Up @@ -123,4 +124,9 @@ public void warn(PrintStream writer, String message) {
writer.print("[WARNING] ");
writer.println(message);
}

@Override
public UIDesktop getDesktop() {
return new ForgeUIDesktop();
}
}
26 changes: 13 additions & 13 deletions plugins/org.jboss.tools.forge2.runtime/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %BundleName
Bundle-SymbolicName: org.jboss.tools.forge2.runtime;singleton:=true
Bundle-Version: 2.12.3.qualifier
Bundle-Version: 2.13.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-Vendor: %BundleProvider
Bundle-Localization: plugin
Eclipse-BundleShape: dir
Bundle-ClassPath: lib/furnace-proxy-2.12.3.Final.jar,
Bundle-ClassPath: lib/furnace-proxy-2.13.0.Final.jar,
lib/forge-javassist-2.jar,
lib/furnace-api-2.12.3.Final.jar,
lib/furnace-se-2.12.3.Final.jar,
lib/ui-api-2.12.3.Final.jar,
lib/convert-api-2.12.3.Final.jar,
lib/ui-spi-2.12.3.Final.jar,
lib/facets-api-2.12.3.Final.jar,
lib/resources-api-2.12.3.Final.jar,
lib/projects-api-2.12.3.Final.jar,
lib/dependencies-api-2.12.3.Final.jar,
lib/shell-spi-2.12.3.Final.jar,
lib/database-tools-api-2.12.3.Final.jar,
lib/furnace-api-2.13.0.Final.jar,
lib/furnace-se-2.13.0.Final.jar,
lib/ui-api-2.13.0.Final.jar,
lib/convert-api-2.13.0.Final.jar,
lib/ui-spi-2.13.0.Final.jar,
lib/facets-api-2.13.0.Final.jar,
lib/resources-api-2.13.0.Final.jar,
lib/projects-api-2.13.0.Final.jar,
lib/dependencies-api-2.13.0.Final.jar,
lib/shell-spi-2.13.0.Final.jar,
lib/database-tools-api-2.13.0.Final.jar,
.
Export-Package: bootpath,
org.jboss.forge.addon.convert,
Expand Down
6 changes: 3 additions & 3 deletions plugins/org.jboss.tools.forge2.runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
</parent>
<groupId>org.jboss.tools.forge.plugins</groupId>
<artifactId>org.jboss.tools.forge2.runtime</artifactId>
<version>2.12.3-SNAPSHOT</version>
<version>2.13.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
<version.furnace>2.12.3.Final</version.furnace>
<version.forge.addons>2.12.3.Final</version.forge.addons>
<version.furnace>2.13.0.Final</version.furnace>
<version.forge.addons>2.13.0.Final</version.forge.addons>
<version.angularjs.addon>2.1.3.Final</version.angularjs.addon>
</properties>
<build>
Expand Down

0 comments on commit f69d8d9

Please sign in to comment.