[teiid-commits] teiid SVN: r784 - in branches/remove_psc/console/src/main: java/com/metamatrix/console/ui/views/deploy/util and 1 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Thu Apr 16 11:09:06 EDT 2009
Author: vhalbert at redhat.com
Date: 2009-04-16 11:09:06 -0400 (Thu, 16 Apr 2009)
New Revision: 784
Modified:
branches/remove_psc/console/src/main/java/com/metamatrix/console/ui/views/deploy/DeployedProcessPanel.java
branches/remove_psc/console/src/main/java/com/metamatrix/console/ui/views/deploy/ServiceDefinitionPanel.java
branches/remove_psc/console/src/main/java/com/metamatrix/console/ui/views/deploy/ServiceDefinitionPropertiesPanel.java
branches/remove_psc/console/src/main/java/com/metamatrix/console/ui/views/deploy/util/DeployPkgUtils.java
branches/remove_psc/console/src/main/resources/com/metamatrix/console/ui/views/deploy/data/ui.properties
Log:
Teiid 323 - changes to console due to refactured, removing unused Config API classes: ProductType, ProductTypeID and ConfigurationLock
Modified: branches/remove_psc/console/src/main/java/com/metamatrix/console/ui/views/deploy/DeployedProcessPanel.java
===================================================================
--- branches/remove_psc/console/src/main/java/com/metamatrix/console/ui/views/deploy/DeployedProcessPanel.java 2009-04-16 12:46:52 UTC (rev 783)
+++ branches/remove_psc/console/src/main/java/com/metamatrix/console/ui/views/deploy/DeployedProcessPanel.java 2009-04-16 15:09:06 UTC (rev 784)
@@ -235,16 +235,7 @@
TitledBorder tBorder;
-
-// JPanel pnlOps = new JPanel();
-// gbc = new GridBagConstraints();
-// gbc.gridx = 0;
-// gbc.gridy = 4;
-// gbc.gridwidth = GridBagConstraints.REMAINDER;
-// gbc.insets = new Insets(3, 3, 3, 3);
-// pnl.add(pnlOps, gbc);
-
-
+
pnlPropsOuter = new JPanel(new GridLayout(1, 1));
setPnlPropsOuterBorder(null);
@@ -420,7 +411,7 @@
new Object[] {getClass(), "initTable"}), //$NON-NLS-1$
""+theException.getMessage(), //$NON-NLS-1$
theException);
- LogManager.logError(LogContexts.PSCDEPLOY,
+ LogManager.logError(LogContexts.CONFIG,
theException,
getClass() + ":initTable"); //$NON-NLS-1$
}
Modified: branches/remove_psc/console/src/main/java/com/metamatrix/console/ui/views/deploy/ServiceDefinitionPanel.java
===================================================================
--- branches/remove_psc/console/src/main/java/com/metamatrix/console/ui/views/deploy/ServiceDefinitionPanel.java 2009-04-16 12:46:52 UTC (rev 783)
+++ branches/remove_psc/console/src/main/java/com/metamatrix/console/ui/views/deploy/ServiceDefinitionPanel.java 2009-04-16 15:09:06 UTC (rev 784)
@@ -38,11 +38,14 @@
import javax.swing.JScrollPane;
import javax.swing.JSplitPane;
import javax.swing.JTabbedPane;
+import javax.swing.border.Border;
+import javax.swing.event.ChangeListener;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.table.TableColumn;
import com.metamatrix.common.config.api.Configuration;
+import com.metamatrix.common.config.api.ConnectorBinding;
import com.metamatrix.common.config.api.ServiceComponentDefn;
import com.metamatrix.common.log.LogManager;
import com.metamatrix.console.connections.ConnectionInfo;
@@ -62,6 +65,7 @@
import com.metamatrix.console.util.StaticUtilities;
import com.metamatrix.toolbox.ui.widget.Splitter;
import com.metamatrix.toolbox.ui.widget.TableWidget;
+import com.metamatrix.toolbox.ui.widget.TitledBorder;
import com.metamatrix.toolbox.ui.widget.table.DefaultTableComparator;
import com.metamatrix.toolbox.ui.widget.table.EnhancedTableColumn;
import com.metamatrix.toolbox.ui.widget.table.EnhancedTableColumnModel;
@@ -85,7 +89,7 @@
private ServiceDefinitionPropertiesPanel propertiesPanel;
/** List <ServiceComponentDefn> */
- private List selectedSvc = new ArrayList();
+ private ServiceComponentDefn selectedSvc = null;
private ListSelectionListener listSelectionListener;
@@ -118,7 +122,7 @@
UserCapabilities cap = null;
try {
cap = UserCapabilities.getInstance();
- canModify = cap.canModifyConnectorBindings(connection);
+ canModify = cap.canUpdateConfiguration(connection);
if (canModify) {
getConfigurationManager().addConfigurationChangeListener(this);
@@ -202,29 +206,30 @@
nameServiceDefnMap.clear();
Configuration config = this.getConfigurationManager().getConfig(Configuration.NEXT_STARTUP_ID);
- Collection<ServiceComponentDefn> bindings = config.getServiceComponentDefns();
- for (Iterator<ServiceComponentDefn> it = bindings.iterator(); it.hasNext();) {
- ServiceComponentDefn cb = it.next();
+ Collection<ServiceComponentDefn> svcs = config.getServiceComponentDefns();
+ for (Iterator<ServiceComponentDefn> it = svcs.iterator(); it.hasNext();) {
+ ServiceComponentDefn svc = it.next();
Vector vec = new Vector(Arrays.asList(new Object[] {
null, null, null
}));
- vec.setElementAt(cb.getName(), SVC_DEFN_COL_NUM);
- vec.setElementAt(cb.isEssential(), ESSENTIAL_COL_NUM);
- vec.setElementAt(cb.getDescription(), DESCRIPTION_COL_NUM);
+ vec.setElementAt(svc.getName(), SVC_DEFN_COL_NUM);
+ vec.setElementAt(svc.isEssential(), ESSENTIAL_COL_NUM);
+ vec.setElementAt(svc.getDescription(), DESCRIPTION_COL_NUM);
tableModel.addRow(vec);
- nameServiceDefnMap.put(cb.getName(), cb);
+ nameServiceDefnMap.put(svc.getName(), svc);
}
-
+
+
} catch (Exception ex) {
ExceptionUtility.showMessage("Retrieve service definition info", ex); //$NON-NLS-1$
LogManager.logError(LogContexts.CONFIG, ex, "Error retrieving service definition info."); //$NON-NLS-1$
}
- forceTableSelection(getSelectedService());
+
}
/**
@@ -234,18 +239,17 @@
* List<ConnectorBinding>
* @since 4.2
*/
- private void forceTableSelection(List bindings) {
+ private void forceTableSelection(ServiceComponentDefn svc) {
table.getSelectionModel().clearSelection();
- Iterator iter = bindings.iterator();
- while (iter.hasNext()) {
- ServiceComponentDefn svc = (ServiceComponentDefn)iter.next();
- int rowForSelected = rowForService(svc.getName());
- if (rowForSelected >= 0) {
- table.getSelectionModel().addSelectionInterval(rowForSelected, rowForSelected);
- table.scrollRectToVisible(table.getCellRect(rowForSelected, 0, true));
- }
- }
+ int rowForSelected = rowForService(svc.getName());
+ if (rowForSelected >= 0) {
+ table.getSelectionModel().addSelectionInterval(rowForSelected,
+ rowForSelected);
+ table.scrollRectToVisible(table
+ .getCellRect(rowForSelected, 0, true));
+ }
+
}
public void postRealize() {
@@ -282,8 +286,7 @@
* @since 4.2
*/
private void setSelectedService(ServiceComponentDefn svc) {
- selectedSvc.clear();
- selectedSvc.add(svc);
+ selectedSvc = svc;
}
/**
@@ -293,10 +296,10 @@
* List<ConnectorBinding>
* @since 4.2
*/
- private void setSelectedServiceDefn(List svcs) {
- selectedSvc.clear();
- selectedSvc.addAll(svcs);
- }
+// private void setSelectedServiceDefn(List svcs) {
+// selectedSvc.clear();
+// selectedSvc.addAll(svcs);
+// }
/**
* Clear the list of selected connector bindings.
@@ -306,7 +309,7 @@
* @since 4.2
*/
private void clearSelectedService() {
- selectedSvc.clear();
+ selectedSvc=null;
}
/**
@@ -315,36 +318,52 @@
* @return List<ConnectorBinding>
* @since 4.2
*/
- private List getSelectedService() {
- return selectedSvc;
+ private ServiceComponentDefn getSelectedService() {
+ int[] selectedRows = table.getSelectedRows();
+ int numSelected = selectedRows.length;
+
+ if (numSelected == 0) {
+ return null;
+ // tableSelectionChangedNoneSelected();
+ } else if (numSelected == 1) {
+ int convertedRow = table.convertRowIndexToModel(selectedRows[0]);
+ String selectedName = (String)table.getModel().getValueAt(convertedRow, SVC_DEFN_COL_NUM);
+ ServiceComponentDefn svc = (ServiceComponentDefn)getServiceDefnXref().get(selectedName);
+ return svc;
+
+ }
+ return null;
}
public void refresh() {
// save the currently selected bindings
- List oldSelectedConnectedBindings = new ArrayList(getSelectedService());
-
+ ServiceComponentDefn olddefn = getSelectedService();
+
try {
- // refresh the connector bindings in the manager
- // this.getConfigurationManager().refresh();
- // constructServiceDefnXref();
populateTable();
- } catch (Exception ex) {
+
+ // get first row
+ if (olddefn == null) {
+ String curRowSvc = table.getValueAt(1, SVC_DEFN_COL_NUM).toString();
+ olddefn = (ServiceComponentDefn) nameServiceDefnMap.get(curRowSvc);
+ }
+
+ } catch (Exception ex) {
ExceptionUtility.showMessage("Failed while refreshing the Services list", ex); //$NON-NLS-1$
LogManager.logError(LogContexts.CONFIG, ex, "Failed while refreshing the Services list"); //$NON-NLS-1$
}
// restore the binding and select it in the table:
- setSelectedServiceDefn(oldSelectedConnectedBindings);
- forceTableSelection(oldSelectedConnectedBindings);
+ setSelectedService(olddefn);
+ forceTableSelection(olddefn);
}
private void tableSelectionChanged() {
boolean cancelled = false;
- List svcs = getSelectedService();
- if (svcs.size() == 1 && anyValueChanged()) {
- ServiceComponentDefn svc = (ServiceComponentDefn) svcs.get(0);
-
+ ServiceComponentDefn svc = getSelectedService();
+ if (anyValueChanged() && svc != null) {
+
String message = "Save changes to Service Definition " + svc + " ?"; //$NON-NLS-1$//$NON-NLS-2$
int response = DialogUtility.showPendingChangesDialog(message, getConnection().getURL(), getConnection().getUser());
@@ -365,9 +384,7 @@
table.getSelectionModel().removeListSelectionListener(listSelectionListener);
//revert to original selection
- ArrayList newList = new ArrayList();
- newList.add(svc);
- forceTableSelection(newList);
+ forceTableSelection(svc);
//restore the listener
table.getSelectionModel().addListSelectionListener(listSelectionListener);
@@ -380,13 +397,14 @@
if (! cancelled) {
StaticUtilities.startWait(ViewManager.getMainFrame());
- int[] selectedRows = table.getSelectedRows();
- int numSelected = selectedRows.length;
+ // int[] selectedRows = table.getSelectedRows();
+ // int numSelected = selectedRows.length;
- if (numSelected == 0) {
- tableSelectionChangedNoneSelected();
- } else if (numSelected == 1) {
- tableSelectionChangedOneSelected(selectedRows[0]);
+ if (svc == null) {
+ clearSelectedService();
+ } else {
+ setSelectedService(svc);
+ tableSelectionChangedOneSelected(svc);
}
forceRepaint();
@@ -394,23 +412,40 @@
}
}
- private void tableSelectionChangedNoneSelected() {
- // clear list of selected bindings
- clearSelectedService();
+// private void tableSelectionChangedNoneSelected() {
+// // clear list of selected bindings
+// clearSelectedService();
+//
+// }
- }
+ private void tableSelectionChangedOneSelected(ServiceComponentDefn defn) {
+ Border border = createTabBorder(defn);
+ int curTab = tabbedPane.getSelectedIndex();
+
+ propertiesPanel.setServiceComponentDefn(defn);
+ propertiesPanel.setBorder(border);
- private void tableSelectionChangedOneSelected(int selectedRow) {
// set list of selected bindings
- int convertedRow = table.convertRowIndexToModel(selectedRow);
- String selectedName = (String)table.getModel().getValueAt(convertedRow, SVC_DEFN_COL_NUM);
- ServiceComponentDefn svc = (ServiceComponentDefn)getServiceDefnXref().get(selectedName);
- setSelectedService(svc);
+// int convertedRow = table.convertRowIndexToModel(selectedRow);
+// String selectedName = (String)table.getModel().getValueAt(convertedRow, SVC_DEFN_COL_NUM);
+// ServiceComponentDefn svc = (ServiceComponentDefn)getServiceDefnXref().get(selectedName);
+ setSelectedService(defn);
}
+ private Border createTabBorder(ServiceComponentDefn defn) {
+ TitledBorder border;
+ String title;
+ if (defn == null) {
+ title = ""; //$NON-NLS-1$
+ } else {
+ title = "Service: " + defn.toString(); //$NON-NLS-1$
+ }
+ border = new TitledBorder(title);
+ return border;
+ }
public java.util.List /* <Action> */resume() {
@@ -432,25 +467,6 @@
return nameServiceDefnMap;
}
-// private void constructServiceDefnXref() {
-// nameServiceDefnMap = new HashMap();
-// ArrayList connectorsList = null;
-// try {
-// connectorsList = getConnectorManager().getConnectorBindings(false);
-// } catch (Exception e) {
-// ExceptionUtility.showMessage("Failed while loading data into Connector Binding Panel", e); //$NON-NLS-1$
-// }
-//
-// Iterator it = connectorsList.iterator();
-// ConnectorBinding tempDefn = null;
-//
-// while (it.hasNext()) {
-// ConnectorAndBinding cab = (ConnectorAndBinding)it.next();
-// tempDefn = (ConnectorBinding)cab.getBinding();
-// nameServiceDefnMap.put(tempDefn.toString(), tempDefn);
-// }
-//
-// }
private void forceRepaint() {
StaticUtilities.jiggleSplitter(splitPane);
@@ -488,5 +504,5 @@
}
-}// end ConnectorBindingPanel
+}// end Panel
Modified: branches/remove_psc/console/src/main/java/com/metamatrix/console/ui/views/deploy/ServiceDefinitionPropertiesPanel.java
===================================================================
--- branches/remove_psc/console/src/main/java/com/metamatrix/console/ui/views/deploy/ServiceDefinitionPropertiesPanel.java 2009-04-16 12:46:52 UTC (rev 783)
+++ branches/remove_psc/console/src/main/java/com/metamatrix/console/ui/views/deploy/ServiceDefinitionPropertiesPanel.java 2009-04-16 15:09:06 UTC (rev 784)
@@ -22,27 +22,32 @@
package com.metamatrix.console.ui.views.deploy;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.GridBagLayout;
+import java.awt.GridLayout;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import javax.swing.JPanel;
-import com.metamatrix.common.actions.ModificationActionQueue;
import com.metamatrix.common.config.api.ComponentDefnID;
import com.metamatrix.common.config.api.Configuration;
import com.metamatrix.common.config.api.ConfigurationObjectEditor;
-import com.metamatrix.common.config.api.ConnectorBinding;
import com.metamatrix.common.config.api.ServiceComponentDefn;
import com.metamatrix.common.log.LogManager;
import com.metamatrix.common.object.PropertiedObject;
-import com.metamatrix.common.object.PropertiedObjectEditor;
import com.metamatrix.console.connections.ConnectionInfo;
-import com.metamatrix.console.models.ConnectorManager;
+import com.metamatrix.console.models.ConfigurationManager;
+import com.metamatrix.console.models.ConfigurationPropertiedObjectEditor;
import com.metamatrix.console.models.ModelManager;
import com.metamatrix.console.ui.layout.ConsoleMainFrame;
-import com.metamatrix.console.ui.util.*;
-import com.metamatrix.console.util.*;
+import com.metamatrix.console.ui.util.POPWithButtons;
+import com.metamatrix.console.ui.util.POPWithButtonsController;
+import com.metamatrix.console.ui.util.PropertiedObjectPanelHolder;
+import com.metamatrix.console.util.ExceptionUtility;
+import com.metamatrix.console.util.LogContexts;
+import com.metamatrix.console.util.StaticUtilities;
import com.metamatrix.toolbox.ui.widget.LabelWidget;
import com.metamatrix.toolbox.ui.widget.TextFieldWidget;
import com.metamatrix.toolbox.ui.widget.property.PropertiedObjectPanel;
@@ -55,18 +60,18 @@
private PropertiedObjectPanelHolder popHolder;
private POPWithButtons popWithButtons = null;
- private TextFieldWidget txfConnectorName = new TextFieldWidget();
- private LabelWidget lblConnectorName = new LabelWidget();
- private TextFieldWidget txfBindingName = new TextFieldWidget();
- private LabelWidget lblBindingName = new LabelWidget();
+ private TextFieldWidget txfServiceName = new TextFieldWidget();
+ private LabelWidget lblServiceName = new LabelWidget();
+ // private TextFieldWidget txfBindingName = new TextFieldWidget();
+// private LabelWidget lblBindingName = new LabelWidget();
private JPanel pnlOuter = new JPanel();
private JPanel pnlPOPShell = new JPanel(new GridLayout(1, 1));
private PropertiedObject poPropObject;
- private PropertiedObjectEditor poe;
+ private ConfigurationPropertiedObjectEditor poe;
private ServiceComponentDefn serviceDefn;
private boolean canModify;
private ConnectionInfo connection;
- private ModificationActionQueue maq = null;
+// private ModificationActionQueue maq = null;
private ConfigurationObjectEditor coe = null;
@@ -76,19 +81,19 @@
this.connection = connection;
init();
try {
- coe = getConnectorManager().getConnectorBindingEditor();
- maq = coe.getDestination();
- poe = getConnectorManager().getPropertiedObjectEditor(maq);
+ coe = getConfigurationManager().getEditor();
+ // maq = coe.getDestination();
+ poe = getPropertiedObjectEditor();
} catch (Exception ex) {
- LogManager.logError(LogContexts.CONNECTOR_BINDINGS, ex,
+ LogManager.logError(LogContexts.CONFIG, ex,
"Error creating Connector Binding Properties Panel."); //$NON-NLS-1$
ExceptionUtility.showMessage(
"Error creating Connector Binding Properties Panel", ex); //$NON-NLS-1$
}
}
- private ConnectorManager getConnectorManager() {
- return ModelManager.getConnectorManager(connection);
+ private ConfigurationManager getConfigurationManager() {
+ return ModelManager.getConfigurationManager(connection);
}
private void init() {
@@ -98,23 +103,23 @@
pnlOuter.setLayout(new GridBagLayout());
- lblBindingName.setText("Binding Name:"); //$NON-NLS-1$
- lblConnectorName.setText("Connector Type:"); //$NON-NLS-1$
+ // lblBindingName.setText("Service Name:"); //$NON-NLS-1$
+ lblServiceName.setText("Servicie Name:"); //$NON-NLS-1$
- txfBindingName.setEditable(false);
- txfConnectorName.setEditable(false);
+// txfBindingName.setEditable(false);
+ txfServiceName.setEditable(false);
add(pnlPOPShell, BorderLayout.CENTER);
}
- private PropertiedObjectEditor getPropertiedObjectEditor() {
+ private ConfigurationPropertiedObjectEditor getPropertiedObjectEditor() {
if (poe == null) {
// 4. create a PropertiedObjectEditor
try {
- poe = getConnectorManager().getPropertiedObjectEditor();
+ poe = getConfigurationManager().getPropertiedObjectEditor();
} catch (Exception e) {
ExceptionUtility.showMessage(
- "Failed to get editor for Binding propd panel ", e); //$NON-NLS-1$
+ "Failed to get editor for Service Properties panel ", e); //$NON-NLS-1$
}
}
return poe;
@@ -130,7 +135,7 @@
poe = getPropertiedObjectEditor();
// 5. Create the PropertiedObjectPanel
- pop = new PropertiedObjectPanel(poe, getConnectorManager().getEncryptor());
+ pop = new PropertiedObjectPanel(poe, getConfigurationManager().getEncryptor());
} catch (RuntimeException ex) {
StaticUtilities.endWait(ConsoleMainFrame.getInstance());
throw ex;
@@ -156,19 +161,19 @@
StaticUtilities.endWait(ConsoleMainFrame.getInstance());
}
- public void setConnectorBinding(ServiceComponentDefn svcDefn) {
+ public void setServiceComponentDefn(ServiceComponentDefn svcDefn) {
this.serviceDefn = svcDefn;
populateTable();
}
- public ServiceComponentDefn getConnectorBinding() {
+ public ServiceComponentDefn getServiceComponentDefn() {
return serviceDefn;
}
public void updatePropertiedObjectPanel() {
- ServiceComponentDefn connectorBindingDefn = getConnectorBinding();
+ ServiceComponentDefn svcdefn = getServiceComponentDefn();
try {
- poPropObject = getConnectorManager().getPropertiedObject(connectorBindingDefn);
+ poPropObject = getConfigurationManager().getPropertiedObjectForComponentObject(svcdefn);
getPropertiedObjectPanel().setNameColumnHeaderWidth(0);
getPropertiedObjectPanel().setPropertiedObject(poPropObject, poe);
poe.setReadOnly(poPropObject, false);
@@ -217,7 +222,7 @@
getPropertiedObjectPanel().refreshDisplay();
}
- public ServiceComponentDefn getNewConnectorBinding() {
+ public ServiceComponentDefn getNewComponentDefn() {
return serviceDefn;
}
@@ -227,15 +232,16 @@
StaticUtilities.displayModalDialogWithOK("Modify Service Definition", //$NON-NLS-1$
"Note: Change will not take effect until connector is " + //$NON-NLS-1$
"restarted in the System State panel."); //$NON-NLS-1$
- getConnectorManager().saveConnectorBinding(maq);
+ // getConfigurationManager().saveConnectorBinding(maq);
+ getConfigurationManager().modifyPropertiedObject(poe);
- ConnectorBinding cb = (ConnectorBinding) getConnectorManager().getConfigurationAdminAPI().getComponentDefn(Configuration.NEXT_STARTUP_ID,
+ ServiceComponentDefn svc = (ServiceComponentDefn) getConfigurationManager().getConfig(Configuration.NEXT_STARTUP_ID).getServiceComponentDefn(
(ComponentDefnID) serviceDefn.getID());
- setConnectorBinding(cb);
+ setServiceComponentDefn(svc);
} catch (Exception ex) {
- LogManager.logError(LogContexts.CONNECTOR_BINDINGS, ex,
+ LogManager.logError(LogContexts.CONFIG, ex,
"Error saving service definition changes."); //$NON-NLS-1$
ExceptionUtility.showMessage("Error saving service definition changes", //$NON-NLS-1$
ex);
Modified: branches/remove_psc/console/src/main/java/com/metamatrix/console/ui/views/deploy/util/DeployPkgUtils.java
===================================================================
--- branches/remove_psc/console/src/main/java/com/metamatrix/console/ui/views/deploy/util/DeployPkgUtils.java 2009-04-16 12:46:52 UTC (rev 783)
+++ branches/remove_psc/console/src/main/java/com/metamatrix/console/ui/views/deploy/util/DeployPkgUtils.java 2009-04-16 15:09:06 UTC (rev 784)
@@ -74,8 +74,9 @@
public static final String[] SERV_DEF_HDRS;
// public static final int VM_COL = 0;
public static final int SERV_COL = 0;
- public static final int ENABLED_COL = 1;
- public static final int ESSENTIAL_COL = 2;
+ public static final int CONNECTOR_COL= 1;
+ public static final int ENABLED_COL = 2;
+ public static final int ESSENTIAL_COL = 3;
/** Key for UserPreferences file for last import/export directory. */
// public static final String LAST_DIR =
@@ -105,9 +106,10 @@
DEPLOY_HDRS[PROCESS_COL] = getString("dpu.deployedprocess.hdr");
// DEPLOY_HDRS[DEPLOY_SVC_COL] = getString("dpu.deployedsvc.hdr");
- SERV_DEF_HDRS = new String[3];
+ SERV_DEF_HDRS = new String[4];
// SERV_DEF_HDRS[VM_COL] = getString("dpu.vm.hdr");
SERV_DEF_HDRS[SERV_COL] = getString("dpu.service.hdr");
+ SERV_DEF_HDRS[CONNECTOR_COL] = getString("dpu.connector.hdr");
SERV_DEF_HDRS[ENABLED_COL] = getString("dpu.enabled.hdr");
SERV_DEF_HDRS[ESSENTIAL_COL] = getString("dpu.essential.hdr");
@@ -255,11 +257,13 @@
row.setElementAt(dsvc, SERV_COL);
ServiceComponentDefnID svcID = (ServiceComponentDefnID) dsvc.getServiceComponentDefnID();
+ ServiceComponentDefn svc = null;
+
+ svc = (ServiceComponentDefn) theConfiguration.getComponentDefn(svcID);
- ServiceComponentDefn svc = theConfiguration
- .getServiceComponentDefn(dsvc
- .getServiceComponentDefnID());
-
+ if (dsvc.isDeployedConnector()) {
+ row.setElementAt(svc.getComponentTypeID().getName(), CONNECTOR_COL);
+ }
row.setElementAt(new Boolean(dsvc.isEnabled()), ENABLED_COL);
row.setElementAt(new Boolean(svc.isEssential()),
ESSENTIAL_COL);
Modified: branches/remove_psc/console/src/main/resources/com/metamatrix/console/ui/views/deploy/data/ui.properties
===================================================================
--- branches/remove_psc/console/src/main/resources/com/metamatrix/console/ui/views/deploy/data/ui.properties 2009-04-16 12:46:52 UTC (rev 783)
+++ branches/remove_psc/console/src/main/resources/com/metamatrix/console/ui/views/deploy/data/ui.properties 2009-04-16 15:09:06 UTC (rev 784)
@@ -184,6 +184,7 @@
dpu.deployedhost.hdr="Host Identifier"
dpu.deployedprocess.hdr="Process"
dpu.deployedsvc.hdr="Service"
+dpu.connector.hdr="Connector Type"
dpu.enabled.hdr="Enabled"
dpu.essential.hdr="Essential"
dpu.msg.initerror="DeployPkgUtils init"
More information about the teiid-commits
mailing list