Author: rob.stryker(a)jboss.com
Date: 2008-12-03 20:45:55 -0500 (Wed, 03 Dec 2008)
New Revision: 12268
Added:
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/JMXNavigator.java
Removed:
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/Navigator.java
Modified:
trunk/jmx/plugins/org.jboss.tools.jmx.ui/plugin.xml
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/editors/AttributesPage.java
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/editors/OperationsPage.java
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/perspectives/JMXPerspective.java
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/QueryContribution.java
Log:
Changed View class's name to be less generic
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/plugin.xml
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.ui/plugin.xml 2008-12-04 01:20:45 UTC (rev
12267)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/plugin.xml 2008-12-04 01:45:55 UTC (rev
12268)
@@ -13,7 +13,7 @@
</category>
<view
category="org.jboss.tools.jmx.ui.views"
- class="org.jboss.tools.jmx.ui.internal.views.navigator.Navigator"
+
class="org.jboss.tools.jmx.ui.internal.views.navigator.JMXNavigator"
icon="icons/full/obj16/jmeth_obj.gif"
id="org.jboss.tools.jmx.ui.internal.views.navigator.MBeanExplorer"
name="%MBeanExplorer.name"
Modified:
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/editors/AttributesPage.java
===================================================================
---
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/editors/AttributesPage.java 2008-12-04
01:20:45 UTC (rev 12267)
+++
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/editors/AttributesPage.java 2008-12-04
01:45:55 UTC (rev 12268)
@@ -24,7 +24,7 @@
import org.jboss.tools.jmx.core.MBeanAttributeInfoWrapper;
import org.jboss.tools.jmx.core.MBeanInfoWrapper;
import org.jboss.tools.jmx.ui.Messages;
-import org.jboss.tools.jmx.ui.internal.views.navigator.Navigator;
+import org.jboss.tools.jmx.ui.internal.views.navigator.JMXNavigator;
import org.jboss.tools.jmx.ui.internal.views.navigator.UpdateSelectionJob;
public class AttributesPage extends FormPage {
@@ -89,7 +89,7 @@
block.createContent(managedForm);
block.masterSection.getTableViewer().addSelectionChangedListener(new
ISelectionChangedListener() {
public void selectionChanged(SelectionChangedEvent event) {
- UpdateSelectionJob.launchJob(Navigator.VIEW_ID);
+ UpdateSelectionJob.launchJob(JMXNavigator.VIEW_ID);
}
});
}
Modified:
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/editors/OperationsPage.java
===================================================================
---
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/editors/OperationsPage.java 2008-12-04
01:20:45 UTC (rev 12267)
+++
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/editors/OperationsPage.java 2008-12-04
01:45:55 UTC (rev 12268)
@@ -25,7 +25,7 @@
import org.jboss.tools.jmx.core.MBeanInfoWrapper;
import org.jboss.tools.jmx.core.MBeanOperationInfoWrapper;
import org.jboss.tools.jmx.ui.Messages;
-import org.jboss.tools.jmx.ui.internal.views.navigator.Navigator;
+import org.jboss.tools.jmx.ui.internal.views.navigator.JMXNavigator;
import org.jboss.tools.jmx.ui.internal.views.navigator.UpdateSelectionJob;
public class OperationsPage extends FormPage {
@@ -90,7 +90,7 @@
block.createContent(managedForm);
block.masterSection.getTableViewer().addSelectionChangedListener(new
ISelectionChangedListener() {
public void selectionChanged(SelectionChangedEvent event) {
- UpdateSelectionJob.launchJob(Navigator.VIEW_ID);
+ UpdateSelectionJob.launchJob(JMXNavigator.VIEW_ID);
}
});
}
Modified:
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/perspectives/JMXPerspective.java
===================================================================
---
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/perspectives/JMXPerspective.java 2008-12-04
01:20:45 UTC (rev 12267)
+++
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/perspectives/JMXPerspective.java 2008-12-04
01:45:55 UTC (rev 12268)
@@ -11,7 +11,7 @@
import org.eclipse.ui.IFolderLayout;
import org.eclipse.ui.IPageLayout;
import org.eclipse.ui.IPerspectiveFactory;
-import org.jboss.tools.jmx.ui.internal.views.navigator.Navigator;
+import org.jboss.tools.jmx.ui.internal.views.navigator.JMXNavigator;
public class JMXPerspective implements IPerspectiveFactory {
@@ -31,11 +31,11 @@
private void addViews() {
IFolderLayout left = factory.createFolder("left", //$NON-NLS-1$
IPageLayout.LEFT, 0.2f, factory.getEditorArea());
- left.addView(Navigator.VIEW_ID);
+ left.addView(JMXNavigator.VIEW_ID);
}
private void addViewShortcuts() {
- factory.addShowViewShortcut(Navigator.VIEW_ID);
+ factory.addShowViewShortcut(JMXNavigator.VIEW_ID);
factory.addShowViewShortcut("org.eclipse.ui.views.PropertySheet");
//$NON-NLS-1$
}
Copied:
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/JMXNavigator.java
(from rev 12053,
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/Navigator.java)
===================================================================
---
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/JMXNavigator.java
(rev 0)
+++
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/JMXNavigator.java 2008-12-04
01:45:55 UTC (rev 12268)
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Jeff Mesnil
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * "Rob Stryker" <rob.stryker(a)redhat.com> - Initial implementation
+ *******************************************************************************/
+package org.jboss.tools.jmx.ui.internal.views.navigator;
+
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.navigator.CommonNavigator;
+import org.jboss.tools.jmx.ui.internal.actions.NewConnectionAction;
+
+/**
+ * The view itself
+ */
+public class JMXNavigator extends CommonNavigator {
+ public static final String VIEW_ID =
"org.jboss.tools.jmx.ui.internal.views.navigator.MBeanExplorer"; //$NON-NLS-1$
+ private Text filterText;
+ private QueryContribution query;
+
+ public JMXNavigator() {
+ super();
+ }
+ protected IAdaptable getInitialInput() {
+ return this;
+ }
+ public void createPartControl(Composite aParent) {
+ fillActionBars();
+ Composite newParent = new Composite(aParent, SWT.NONE);
+ newParent.setLayout(new FormLayout());
+ super.createPartControl(newParent);
+ filterText = new Text(newParent, SWT.SINGLE | SWT.BORDER );
+
+ // layout the two objects
+ FormData fd = new FormData();
+ fd.left = new FormAttachment(0,5);
+ fd.right = new FormAttachment(100,-5);
+ fd.top = new FormAttachment(0,5);
+ filterText.setLayoutData(fd);
+
+ fd = new FormData();
+ fd.left = new FormAttachment(0,0);
+ fd.right = new FormAttachment(100,0);
+ fd.top = new FormAttachment(filterText, 5);
+ fd.bottom = new FormAttachment(100,0);
+ getCommonViewer().getTree().setLayoutData(fd);
+
+ filterText.setToolTipText("Type in a filter");
+ filterText.setText("Type in a filter");
+
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ query = new QueryContribution(JMXNavigator.this);
+ }
+ });
+ }
+
+ public Text getFilterText() {
+ return filterText;
+ }
+
+ public void fillActionBars() {
+// queryContribution = new QueryContribution(this);
+// getViewSite().getActionBars().getToolBarManager().add(queryContribution);
+ getViewSite().getActionBars().getToolBarManager().add(new NewConnectionAction());
+ getViewSite().getActionBars().getToolBarManager().add(new Separator());
+ getViewSite().getActionBars().updateActionBars();
+ }
+}
Property changes on:
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/JMXNavigator.java
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted:
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/Navigator.java
===================================================================
---
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/Navigator.java 2008-12-04
01:20:45 UTC (rev 12267)
+++
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/Navigator.java 2008-12-04
01:45:55 UTC (rev 12268)
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Jeff Mesnil
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * "Rob Stryker" <rob.stryker(a)redhat.com> - Initial implementation
- *******************************************************************************/
-package org.jboss.tools.jmx.ui.internal.views.navigator;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.navigator.CommonNavigator;
-import org.jboss.tools.jmx.ui.internal.actions.NewConnectionAction;
-
-/**
- * The view itself
- */
-public class Navigator extends CommonNavigator {
- public static final String VIEW_ID =
"org.jboss.tools.jmx.ui.internal.views.navigator.MBeanExplorer"; //$NON-NLS-1$
- private Text filterText;
- private QueryContribution query;
-
- public Navigator() {
- super();
- }
- protected IAdaptable getInitialInput() {
- return this;
- }
- public void createPartControl(Composite aParent) {
- fillActionBars();
- Composite newParent = new Composite(aParent, SWT.NONE);
- newParent.setLayout(new FormLayout());
- super.createPartControl(newParent);
- filterText = new Text(newParent, SWT.SINGLE | SWT.BORDER );
-
- // layout the two objects
- FormData fd = new FormData();
- fd.left = new FormAttachment(0,5);
- fd.right = new FormAttachment(100,-5);
- fd.top = new FormAttachment(0,5);
- filterText.setLayoutData(fd);
-
- fd = new FormData();
- fd.left = new FormAttachment(0,0);
- fd.right = new FormAttachment(100,0);
- fd.top = new FormAttachment(filterText, 5);
- fd.bottom = new FormAttachment(100,0);
- getCommonViewer().getTree().setLayoutData(fd);
-
- filterText.setToolTipText("Type in a filter");
- filterText.setText("Type in a filter");
-
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- query = new QueryContribution(Navigator.this);
- }
- });
- }
-
- public Text getFilterText() {
- return filterText;
- }
-
- public void fillActionBars() {
-// queryContribution = new QueryContribution(this);
-// getViewSite().getActionBars().getToolBarManager().add(queryContribution);
- getViewSite().getActionBars().getToolBarManager().add(new NewConnectionAction());
- getViewSite().getActionBars().getToolBarManager().add(new Separator());
- getViewSite().getActionBars().updateActionBars();
- }
-}
Modified:
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/QueryContribution.java
===================================================================
---
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/QueryContribution.java 2008-12-04
01:20:45 UTC (rev 12267)
+++
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/QueryContribution.java 2008-12-04
01:45:55 UTC (rev 12268)
@@ -54,12 +54,12 @@
private String filterText;
- private Navigator navigator;
+ private JMXNavigator navigator;
private HashMap<Object, Boolean> matches = null;
private HashMap<Object, Boolean> shouldShow = null;
private RefineThread refineThread;
- public QueryContribution(final Navigator navigator) {
+ public QueryContribution(final JMXNavigator navigator) {
this.navigator = navigator;
map.put(navigator.getCommonViewer(), this);
addListener();