From f8194dbe258bc50ad55fd84fd488d06d06de7a6f Mon Sep 17 00:00:00 2001 From: Lars Heinemann Date: Thu, 11 Feb 2016 11:50:14 +0100 Subject: [PATCH] fixed problems due to refactoring and added dummy impl for global config tab --- .../META-INF/MANIFEST.MF | 10 +-- .../org.fusesource.ide.sap.ui/plugin.xml | 15 ++++ .../org/fusesource/ide/sap/ui/Activator.java | 2 +- .../provider/SAPServerContribution.java | 89 +++++++++++++++++++ jboss-fuse-sap-tool-suite/pom.xml | 2 +- 5 files changed, 111 insertions(+), 7 deletions(-) create mode 100644 jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/globalconf/provider/SAPServerContribution.java diff --git a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/META-INF/MANIFEST.MF b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/META-INF/MANIFEST.MF index ea53d5c..0153868 100644 --- a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/META-INF/MANIFEST.MF +++ b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/META-INF/MANIFEST.MF @@ -13,16 +13,16 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.databinding.property, org.eclipse.jface.databinding, org.eclipse.core.databinding.beans, + org.eclipse.core.expressions, org.eclipse.graphiti;bundle-version="0.13.0", + org.eclipse.ui.views.properties.tabbed, com.sap.conn.jco, + org.fusesource.ide.camel.model.service.core;bundle-version="8.0.0", org.fusesource.camel.component.sap;bundle-version="6.2.0", org.fusesource.camel.component.sap.model;bundle-version="6.2.0", org.fusesource.camel.component.sap.model.edit;bundle-version="6.2.0", - org.fusesource.ide.camel.model.service.core;bundle-version="8.0.0", - org.fusesource.ide.commons;bundle-version="8.0.0", - org.eclipse.core.expressions, - org.eclipse.ui.views.properties.tabbed, - org.fusesource.ide.camel.editor;bundle-version="8.0.0" + org.fusesource.ide.camel.editor;bundle-version="8.0.0", + org.fusesource.ide.foundation.ui;bundle-version="8.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor diff --git a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/plugin.xml b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/plugin.xml index dd5e4c9..f040e12 100644 --- a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/plugin.xml +++ b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/plugin.xml @@ -596,4 +596,19 @@ class="org.fusesource.ide.sap.ui.editor.provider.SapIDocListServerPaletteEntry"> + + + + + + diff --git a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/Activator.java b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/Activator.java index ab6dc5d..17f4254 100644 --- a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/Activator.java +++ b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/Activator.java @@ -17,9 +17,9 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.fusesource.ide.commons.logging.RiderLogFacade; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; +import org.fusesource.ide.foundation.ui.logging.RiderLogFacade; /** * The activator class controls the plug-in life cycle diff --git a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/globalconf/provider/SAPServerContribution.java b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/globalconf/provider/SAPServerContribution.java new file mode 100644 index 0000000..a056c6c --- /dev/null +++ b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/globalconf/provider/SAPServerContribution.java @@ -0,0 +1,89 @@ +/******************************************************************************* + * Copyright (c) 2016 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.fusesource.ide.sap.ui.editor.globalconf.provider; + +import static org.fusesource.ide.sap.ui.Activator.CAMEL_SAP_ARTIFACT_ID; +import static org.fusesource.ide.sap.ui.Activator.CAMEL_SAP_GROUP_ID; +import static org.fusesource.ide.sap.ui.Activator.CAMEL_SAP_VERSION; + +import java.util.ArrayList; +import java.util.List; + +import org.fusesource.ide.camel.editor.provider.ext.GlobalConfigElementType; +import org.fusesource.ide.camel.editor.provider.ext.GlobalConfigurationTypeWizard; +import org.fusesource.ide.camel.editor.provider.ext.ICustomGlobalConfigElementContribution; +import org.fusesource.ide.camel.model.service.core.catalog.Dependency; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +/** + * @author lhein + */ +public class SAPServerContribution implements ICustomGlobalConfigElementContribution { + + /* (non-Javadoc) + * @see org.fusesource.ide.camel.editor.provider.ext.ICustomGlobalConfigElementContribution#createGlobalElement(org.w3c.dom.Document) + */ + @Override + public GlobalConfigurationTypeWizard createGlobalElement(Document document) { + return null; + } + + /* + * (non-Javadoc) + * @see org.fusesource.ide.camel.editor.provider.ext.ICustomGlobalConfigElementContribution#modifyGlobalElement(org.w3c.dom.Document, org.w3c.dom.Node) + */ + @Override + public GlobalConfigurationTypeWizard modifyGlobalElement(Document document) { + return null; + } + + /* (non-Javadoc) + * @see org.fusesource.ide.camel.editor.provider.ext.ICustomGlobalConfigElementContribution#onGlobalElementDeleted(org.w3c.dom.Node) + */ + @Override + public void onGlobalElementDeleted(Node node) { + System.err.println("received info that node has been deleted!"); + } + + /* (non-Javadoc) + * @see org.fusesource.ide.camel.editor.provider.ext.ICustomGlobalConfigElementContribution#canHandle(org.w3c.dom.Node) + */ + @Override + public boolean canHandle(Node nodeToHandle) { + return ((Element)nodeToHandle).getAttribute("id").equals("mySAPBeanId"); + } + + /* (non-Javadoc) + * @see org.fusesource.ide.camel.editor.provider.ext.ICustomGlobalConfigElementContribution#getGlobalConfigElementType() + */ + @Override + public GlobalConfigElementType getGlobalConfigElementType() { + return GlobalConfigElementType.GLOBAL_ELEMENT; + } + + /* (non-Javadoc) + * @see org.fusesource.ide.camel.editor.provider.ext.ICustomGlobalConfigElementContribution#getElementDependencies() + */ + @Override + public List getElementDependencies() { + List deps = new ArrayList(); + + Dependency dep = new Dependency(); + dep.setGroupId(CAMEL_SAP_GROUP_ID); + dep.setArtifactId(CAMEL_SAP_ARTIFACT_ID); + dep.setVersion(CAMEL_SAP_VERSION); + deps.add(dep); + + return deps; + } +} diff --git a/jboss-fuse-sap-tool-suite/pom.xml b/jboss-fuse-sap-tool-suite/pom.xml index f4fb299..65b2be6 100644 --- a/jboss-fuse-sap-tool-suite/pom.xml +++ b/jboss-fuse-sap-tool-suite/pom.xml @@ -17,7 +17,7 @@ - 4.3.0.Beta1f-SNAPSHOT + 4.3.1.Beta1 0.23.1-SNAPSHOT