Skip to content

Commit

Permalink
Merge pull request #98 from phantomjinx/master
Browse files Browse the repository at this point in the history 
Panel for default server
  • Loading branch information
@blafond
blafond committed Feb 7, 2013
2 parents 220e9cb + 8a427a1 commit d25adce
Show file tree
Hide file tree
Showing 7 changed files with 182 additions and 14 deletions.
26 changes: 14 additions & 12 deletions plugins/org.teiid.designer.core/src/org/teiid/designer/core/ModelerCore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2133,17 +2133,20 @@ public static void removeTeiidServerVersionListener(ITeiidServerVersionListener
* @param defaultServer
*/
public static void setDefaultServer(ITeiidServer defaultServer) {
if (defaultServer == null)
return;

if (defaultTeiidServer != null && defaultTeiidServer.equals(defaultServer))
return;

ITeiidServerVersion oldServerVersion = defaultTeiidServer != null ? defaultTeiidServer.getServerVersion() : null;
ITeiidServerVersion newServerVersion = defaultServer.getServerVersion();
ITeiidServerVersion newServerVersion = defaultServer != null ? defaultServer.getServerVersion() : null;

defaultTeiidServer = defaultServer;


if (teiidServerVersionListeners != null) {
for (ITeiidServerVersionListener listener : teiidServerVersionListeners) {
listener.serverChanged(defaultServer);
}
}

/*
* Compare the versions of the server.
*
Expand All @@ -2152,20 +2155,19 @@ public static void setDefaultServer(ITeiidServer defaultServer) {
*/
if (oldServerVersion != null && oldServerVersion.equals(newServerVersion))
return;

// Server version change has occurred so close all editors and notify server version listeners

for (IWorkbenchWindow window : PlatformUI.getWorkbench().getWorkbenchWindows()) {
for (IWorkbenchPage page : window.getPages()) {
page.closeAllEditors(true);
}
}

if (teiidServerVersionListeners == null)
return;

for (ITeiidServerVersionListener listener : teiidServerVersionListeners) {
listener.versionChanged(defaultServer.getServerVersion());
listener.versionChanged(getTeiidServerVersion());
}
}

Expand Down
6 changes: 6 additions & 0 deletions ...eiid.designer.diagram.ui/src/org/teiid/designer/diagram/ui/util/DiagramEntityManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.teiid.designer.diagram.ui.DiagramUiConstants;
import org.teiid.designer.metamodels.diagram.AbstractDiagramEntity;
import org.teiid.designer.metamodels.diagram.Diagram;
import org.teiid.designer.runtime.spi.ITeiidServer;
import org.teiid.designer.runtime.spi.ITeiidServerVersionListener;
import org.teiid.designer.runtime.version.spi.ITeiidServerVersion;
import org.teiid.designer.ui.UiPlugin;
Expand Down Expand Up @@ -63,6 +64,11 @@ public void processEvent(EventObject event) {

teiidServerVersionListener = new ITeiidServerVersionListener() {

@Override
public void serverChanged(ITeiidServer server) {
// Nothing to do
}

@Override
public void versionChanged(ITeiidServerVersion version) {
// Clear the diagram cache since the diagrams are invalid given the server version
Expand Down
7 changes: 7 additions & 0 deletions ...rg.teiid.designer.spi/src/org/teiid/designer/runtime/spi/ITeiidServerVersionListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
*/
public interface ITeiidServerVersionListener {

/**
* Server has been changed
*
* @param server
*/
void serverChanged(ITeiidServer server);

/**
* Version of teiid server has been changed
*
Expand Down
6 changes: 6 additions & 0 deletions ...signer.transformation/src/org/teiid/designer/transformation/util/SqlMappingRootCache.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.teiid.designer.metamodels.transformation.SqlTransformationMappingRoot;
import org.teiid.designer.query.sql.ISQLConstants;
import org.teiid.designer.query.sql.lang.ICommand;
import org.teiid.designer.runtime.spi.ITeiidServer;
import org.teiid.designer.runtime.spi.ITeiidServerVersionListener;
import org.teiid.designer.runtime.version.spi.ITeiidServerVersion;
import org.teiid.designer.transformation.TransformationPlugin;
Expand Down Expand Up @@ -60,6 +61,11 @@ public class SqlMappingRootCache implements ISQLConstants {
static {
teiidServerVersionListener = new ITeiidServerVersionListener() {

@Override
public void serverChanged(ITeiidServer server) {
// Nothing to do
}

@Override
public void versionChanged(ITeiidServerVersion version) {
/*
Expand Down
6 changes: 6 additions & 0 deletions plugins/org.teiid.designer.udf/src/org/teiid/designer/udf/UdfManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import org.teiid.designer.metamodels.relational.RelationalPackage;
import org.teiid.designer.metamodels.relational.util.PushdownFunctionData;
import org.teiid.designer.query.IQueryService;
import org.teiid.designer.runtime.spi.ITeiidServer;
import org.teiid.designer.runtime.spi.ITeiidServerVersionListener;
import org.teiid.designer.runtime.version.spi.ITeiidServerVersion;

Expand Down Expand Up @@ -81,6 +82,11 @@ public final class UdfManager implements IResourceChangeListener {

private ITeiidServerVersionListener teiidServerVersionListener = new ITeiidServerVersionListener() {

@Override
public void serverChanged(ITeiidServer server) {
// Nothing to do
}

@Override
public void versionChanged(ITeiidServerVersion version) {
systemFunctionLibrary = null;
Expand Down
139 changes: 138 additions & 1 deletion ....teiid.designer.ui/src/org/teiid/designer/ui/explorer/ModelExplorerResourceNavigator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.viewers.AbstractTreeViewer;
import org.eclipse.jface.viewers.DecoratingLabelProvider;
Expand All @@ -57,9 +59,11 @@
import org.eclipse.swt.dnd.FileTransfer;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IActionDelegate;
Expand All @@ -69,10 +73,17 @@
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.actions.OpenFileAction;
import org.eclipse.ui.actions.RefreshAction;
import org.eclipse.ui.forms.events.HyperlinkAdapter;
import org.eclipse.ui.forms.events.HyperlinkEvent;
import org.eclipse.ui.forms.widgets.ExpandableComposite;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.Hyperlink;
import org.eclipse.ui.forms.widgets.Section;
import org.eclipse.ui.ide.IGotoMarker;
import org.eclipse.ui.part.IShowInTarget;
import org.eclipse.ui.part.PluginTransfer;
Expand All @@ -86,6 +97,9 @@
import org.teiid.core.designer.util.I18nUtil;
import org.teiid.designer.core.ModelerCore;
import org.teiid.designer.core.workspace.DotProjectUtils;
import org.teiid.designer.runtime.spi.ITeiidServer;
import org.teiid.designer.runtime.spi.ITeiidServerVersionListener;
import org.teiid.designer.runtime.version.spi.ITeiidServerVersion;
import org.teiid.designer.ui.PluginConstants;
import org.teiid.designer.ui.UiConstants;
import org.teiid.designer.ui.UiPlugin;
Expand Down Expand Up @@ -222,6 +236,31 @@ private static void readFilters() {
private MenuManager menuMgr; // context menu
private IPartListener partListener;

private FormToolkit toolkit;
private Section defaultServerSection;
private Composite defaultServerSectionBody;
private Hyperlink defaultServerLink;
private Label defaultServerVersionLabel;

private ITeiidServerVersionListener teiidServerVersionListener = new ITeiidServerVersionListener() {

@Override
public void serverChanged(ITeiidServer server) {
if (defaultServerLink == null)
return;

setDefaultServerText(server);
}

@Override
public void versionChanged(ITeiidServerVersion version) {
if (defaultServerVersionLabel == null)
return;

setDefaultServerVersionText(version);
}
};

/**
* Construct an instance of ModelExplorerResourceNavigator.
*/
Expand All @@ -235,7 +274,23 @@ public ModelExplorerResourceNavigator() {
*/
@Override
public void createPartControl( final Composite parent ) {
super.createPartControl(parent);
/* Set the parent's layout to grid layout to allow the two components */
GridDataFactory.fillDefaults().grab(true, true).applyTo(parent);
GridLayoutFactory.fillDefaults().applyTo(parent);

toolkit = new FormToolkit(parent.getDisplay());

/* Panel to hold the viewer and server status panel */
Composite panel = new Composite(parent, SWT.NONE);
GridDataFactory.fillDefaults().grab(true, true).applyTo(panel);
GridLayoutFactory.fillDefaults().applyTo(panel);

/* Create viewer */
super.createPartControl(panel);
GridDataFactory.fillDefaults().grab(true, true).applyTo(getTreeViewer().getTree());

/* Create status panel */
createServerStatusPanel(panel);

// Create selection helper
new ModelExplorerSelectionHelper(getTreeViewer());
Expand Down Expand Up @@ -377,6 +432,86 @@ public void run() {
addCustomListeners();
}

/**
* @param parent
* @param toolkit
*/
private void createServerStatusPanel(Composite parent) {
defaultServerSection = toolkit.createSection(parent, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED );
Color bkgdColor = toolkit.getColors().getBackground();
defaultServerSection.setText(getString("defaultServerTitle")); //$NON-NLS-1$
defaultServerSection.setTitleBarForeground(Display.getCurrent().getSystemColor(SWT.COLOR_DARK_BLUE));
GridDataFactory.fillDefaults().grab(true, false).applyTo(defaultServerSection);

defaultServerSectionBody = new Composite(defaultServerSection, SWT.NONE);
GridDataFactory.fillDefaults().grab(true, true).applyTo(defaultServerSectionBody);
GridLayoutFactory.fillDefaults().numColumns(2).applyTo(defaultServerSectionBody);
defaultServerSectionBody.setBackground(bkgdColor);

setDefaultServerText(ModelerCore.getDefaultServer());
setDefaultServerVersionText(ModelerCore.getTeiidServerVersion());

defaultServerSection.setClient(defaultServerSectionBody);

ModelerCore.addTeiidServerVersionListener(teiidServerVersionListener);
}

private void setDefaultServerText(ITeiidServer defaultServer) {
String defaultName = defaultServer != null ? defaultServer.getDisplayName() : getString("noDefaultServer"); //$NON-NLS-1$
String linkText = defaultName;

if (defaultServerLink == null) {
toolkit.createLabel(defaultServerSectionBody, getString("defaultServerPrefix")); //$NON-NLS-1$

defaultServerLink = toolkit.createHyperlink(defaultServerSectionBody, linkText, SWT.NONE);
GridDataFactory.fillDefaults().grab(true, false).applyTo(defaultServerLink);

defaultServerLink.addHyperlinkListener(new HyperlinkAdapter() {

@Override
public void linkActivated(HyperlinkEvent e) {
//open the servers view
IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
try {
window.getActivePage().showView("org.eclipse.wst.server.ui.ServersView"); //$NON-NLS-1$
} catch (PartInitException ex) {
UiConstants.Util.log(ex);
}
}
});

} else {
Display display = defaultServerSectionBody.getDisplay();
final String hyperlinkText = linkText;
display.asyncExec(new Runnable() {

@Override
public void run() {
defaultServerLink.setText(hyperlinkText);
}
});
}
}

private void setDefaultServerVersionText(ITeiidServerVersion teiidServerVersion) {
String defaultVersionValue = teiidServerVersion.toString();
final String labelText = getString("defaultServerVersionPrefix") + defaultVersionValue; //$NON-NLS-1$

if (defaultServerVersionLabel == null) {
defaultServerVersionLabel = toolkit.createLabel(defaultServerSectionBody, labelText);
GridDataFactory.fillDefaults().grab(true, false).span(2, 1).applyTo(defaultServerVersionLabel);
} else {
Display display = defaultServerSectionBody.getDisplay();
display.asyncExec(new Runnable() {

@Override
public void run() {
defaultServerVersionLabel.setText(labelText);
}
});
}
}

/**
* Created this protected method so the VdbView can override it. There were TWO resource event processors in Dimension and
* Siperian kits and we only need to wire ONE of them up.
Expand Down Expand Up @@ -487,6 +622,8 @@ protected IAction getPreviewDataAction() {
@Override
public void dispose() {
// Remove listeners
ModelerCore.removeTeiidServerVersionListener(teiidServerVersionListener);

// unhook the selection listeners from the seleciton service
getViewSite().getWorkbenchWindow().getSelectionService().removeSelectionListener(getModelObjectSelectionListener());

Expand Down
6 changes: 5 additions & 1 deletion plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/i18n.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -954,7 +954,11 @@ ModelExplorerResourceNavigator.msg.noDefaultCopyActionFound=No default copy glob
ModelExplorerResourceNavigator.refreshAction.tooltip=Refresh Markers
ModelExplorerResourceNavigator.refreshAction.text=Refresh Markers
ModelExplorerResourceNavigator.restoreStateError.title=Model Explorer Error
ModelExplorerResourceNavigator.restoreStateError.text=Error restoring Explorer state:\n\n{0}
ModelExplorerResourceNavigator.restoreStateError.text=Error restoring Explorer state\:\n\n{0}
ModelExplorerResourceNavigator.defaultServerTitle=Default Teiid Server
ModelExplorerResourceNavigator.noDefaultServer=No default server defined
ModelExplorerResourceNavigator.defaultServerPrefix=Server:
ModelExplorerResourceNavigator.defaultServerVersionPrefix=Targeted Version:

#=================================================================================================================================
# SortModelContentsAction
Expand Down

0 comments on commit d25adce

Please sign in to comment.