Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Macguire2002-06-12 02:59:17 +0000
committerKevin Macguire2002-06-12 02:59:17 +0000
commitd9ffea30be8076b62cb5b7820864935d271e6838 (patch)
tree879017016fbaa34c9ecb4ab13d79b4103bb5fe5b
parentcdae9ae3d1837295635ea6da47d00690f5770b20 (diff)
downloadeclipse.platform.team-d9ffea30be8076b62cb5b7820864935d271e6838.tar.gz
eclipse.platform.team-d9ffea30be8076b62cb5b7820864935d271e6838.tar.xz
eclipse.platform.team-d9ffea30be8076b62cb5b7820864935d271e6838.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/IRemoteTargetResource.java10
-rw-r--r--bundles/org.eclipse.team.ui/icons/full/cview16/site_view.gifbin226 -> 0 bytes
-rw-r--r--bundles/org.eclipse.team.ui/plugin.properties4
-rw-r--r--bundles/org.eclipse.team.ui/plugin.xml29
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/UIConstants.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ConfigureTargetWizard.java21
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteElement.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerView.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/ISharedImages.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamImages.java3
10 files changed, 30 insertions, 50 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/IRemoteTargetResource.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/IRemoteTargetResource.java
index 0000f2f94..9106a876d 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/IRemoteTargetResource.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/IRemoteTargetResource.java
@@ -103,4 +103,14 @@ public interface IRemoteTargetResource extends IRemoteResource {
* Return the site where this remote resource exists
*/
public Site getSite();
+
+ /**
+ * Return true if this can be reached (in some fashion).
+ * This method is not guaranteed to catch all connection failure cases but is used
+ * to at least test the waters.
+ * @param monitor
+ * @return boolean
+ */
+ boolean canBeReached(IProgressMonitor monitor) throws TeamException;
+
}
diff --git a/bundles/org.eclipse.team.ui/icons/full/cview16/site_view.gif b/bundles/org.eclipse.team.ui/icons/full/cview16/site_view.gif
deleted file mode 100644
index 6f03d10e5..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/cview16/site_view.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.team.ui/plugin.properties b/bundles/org.eclipse.team.ui/plugin.properties
index e7237b82d..0f6c91db7 100644
--- a/bundles/org.eclipse.team.ui/plugin.properties
+++ b/bundles/org.eclipse.team.ui/plugin.properties
@@ -20,13 +20,9 @@ ProjectSetImportWizard.name=Team Project Set
ProjectSetExportWizard.name=Team Project Set
ProjectSetExportWizard.description=A wizard that exports a Team Project Set
-SiteExplorerView.name=Site Explorer
-
-Deployment.viewCategory=Target Management
Deployment.group=Depl&oy
Deployment.getAction=&Target
Deployment.uploadAction=Upl&oad
-Deployment.configSite=Tar&get Site...
Deployment.synchronize=Synchroni&ze with Target...
SiteExplorerGetAs.label=Download &As...
diff --git a/bundles/org.eclipse.team.ui/plugin.xml b/bundles/org.eclipse.team.ui/plugin.xml
index 2fba0801d..f4000a7d2 100644
--- a/bundles/org.eclipse.team.ui/plugin.xml
+++ b/bundles/org.eclipse.team.ui/plugin.xml
@@ -117,20 +117,7 @@
label="%Deployment.synchronize">
</action>
</objectContribution>
-
- <objectContribution
- id="org.eclipse.team.ui.ProjectContributions"
- objectClass="org.eclipse.core.resources.IProject" adaptable="true">
- <action
- id="org.eclipse.team.ui.TargetProject"
- label="%Deployment.configSite"
- tooltip="%ConfigureTargetProject.tooltip"
- menubarPath="team.main/projectGroup"
- enablesFor="1"
- class="org.eclipse.team.internal.ui.target.TargetProjectAction">
- </action>
- </objectContribution>
-
+
<objectContribution
objectClass="org.eclipse.team.internal.ui.target.RemoteResourceElement"
id="org.eclipse.team.internal.ui.target.RemoteResourceElement">
@@ -177,20 +164,6 @@
category="org.eclipse.team.ui"
class="org.eclipse.team.internal.ui.sync.SyncView">
</view>
-
- <category
- id="org.eclipse.team.ui.target"
- name="%Deployment.viewCategory">
- </category>
- <view
- id="org.eclipse.team.ui.target.SiteExplorerView"
- name="%SiteExplorerView.name"
- icon="icons/full/cview16/site_view.gif"
- category="org.eclipse.team.ui.target"
- fastViewWidthRatio="0.75"
- class="org.eclipse.team.internal.ui.target.SiteExplorerView">
- </view>
-
</extension>
<!-- ****************** Import Wizards ********************* -->
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/UIConstants.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/UIConstants.java
index 7130a9982..562c9dfca 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/UIConstants.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/UIConstants.java
@@ -41,4 +41,8 @@ public interface UIConstants {
// preferences
public final String PREF_ALWAYS_IN_INCOMING_OUTGOING = "pref_always_in_incoming_outgoing"; //$NON-NLS-1$
+
+ //objects
+ public final String IMG_SITE_ELEMENT = "clcl16/site_element.gif"; //$NON-NLS-1$
+
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ConfigureTargetWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ConfigureTargetWizard.java
index be3429d91..2b5307d7e 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ConfigureTargetWizard.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ConfigureTargetWizard.java
@@ -276,18 +276,17 @@ public class ConfigureTargetWizard extends Wizard implements IConfigurationWizar
container.run(true, false, new IRunnableWithProgress() {
public void run(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException {
-// try {
-// monitor.beginTask(Policy.bind("ConfigureTargetWizardValidating_connection_to_Site..._9"), monitor.UNKNOWN); //$NON-NLS-1$
-// IRemoteTargetResource remote = site.getRemoteResource();
-// valid[0] = remote.canBeReached(monitor);
- valid[0] = true;
-// } catch(TeamException e) {
-// message[0] = e.getStatus().getMessage();
-// code[0] = e.getStatus().getCode();
-// valid[0] = false;
-// } finally {
+ try {
+ monitor.beginTask(Policy.bind("ConfigureTargetWizardValidating_connection_to_Site..._9"), monitor.UNKNOWN); //$NON-NLS-1$
+ IRemoteTargetResource remote = site.getRemoteResource();
+ valid[0] = remote.canBeReached(monitor);
+ } catch(TeamException e) {
+ message[0] = e.getStatus().getMessage();
+ code[0] = e.getStatus().getCode();
+ valid[0] = false;
+ } finally {
monitor.done();
-// }
+ }
}
});
} catch (InvocationTargetException e) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteElement.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteElement.java
index 1f166070b..c26cf7a1b 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteElement.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteElement.java
@@ -23,6 +23,7 @@ import org.eclipse.team.core.TeamException;
import org.eclipse.team.internal.core.target.IRemoteTargetResource;
import org.eclipse.team.internal.core.target.Site;
import org.eclipse.team.internal.ui.TeamUIPlugin;
+import org.eclipse.team.internal.ui.UIConstants;
import org.eclipse.team.ui.ISharedImages;
import org.eclipse.team.ui.TeamImages;
import org.eclipse.ui.model.IWorkbenchAdapter;
@@ -55,7 +56,7 @@ public class SiteElement extends RemoteResourceElement {
}
public ImageDescriptor getImageDescriptor(Object object) {
- return TeamImages.getImageDescriptor(ISharedImages.IMG_SITE_ELEMENT);
+ return TeamImages.getImageDescriptor(UIConstants.IMG_SITE_ELEMENT);
}
public String getLabel(Object o) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerView.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerView.java
index bcf63c8f4..d2560f5d3 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerView.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerView.java
@@ -46,6 +46,7 @@ import org.eclipse.team.internal.core.target.TargetManager;
import org.eclipse.team.internal.ui.IHelpContextIds;
import org.eclipse.team.internal.ui.Policy;
import org.eclipse.team.internal.ui.TeamUIPlugin;
+import org.eclipse.team.internal.ui.UIConstants;
import org.eclipse.team.ui.ISharedImages;
import org.eclipse.team.ui.TeamImages;
import org.eclipse.ui.IActionBars;
@@ -375,7 +376,7 @@ public class SiteExplorerView extends ViewPart implements ISiteListener {
// Create actions
// Refresh (toolbar)
- addSiteAction = new Action(Policy.bind("SiteExplorerView.addSiteAction"), TeamImages.getImageDescriptor(ISharedImages.IMG_SITE_ELEMENT)) { //$NON-NLS-1$
+ addSiteAction = new Action(Policy.bind("SiteExplorerView.addSiteAction"), TeamImages.getImageDescriptor(UIConstants.IMG_SITE_ELEMENT)) { //$NON-NLS-1$
public void run() {
ConfigureTargetWizard wizard = new ConfigureTargetWizard();
wizard.init(null, null);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/ISharedImages.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/ISharedImages.java
index a79364a4c..c055020d9 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/ISharedImages.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/ISharedImages.java
@@ -17,8 +17,5 @@ public interface ISharedImages {
public final String IMG_DIRTY_OVR = "ovr/dirty_ov.gif"; //$NON-NLS-1$
public final String IMG_CHECKEDIN_OVR = "ovr/version_controlled.gif"; //$NON-NLS-1$
public final String IMG_CHECKEDOUT_OVR = "ovr/checkedout_ov.gif"; //$NON-NLS-1$
-
- public final String IMG_SITE_VIEW = "cview16/site_view.gif"; //$NON-NLS-1$
- public final String IMG_SITE_ELEMENT = "clcl16/site_element.gif"; //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamImages.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamImages.java
index 707a3ebee..3d1745565 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamImages.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamImages.java
@@ -86,8 +86,7 @@ public class TeamImages {
createImageDescriptor(ISharedImages.IMG_CHECKEDOUT_OVR, baseURL);
// Target Management Icons
- createImageDescriptor(ISharedImages.IMG_SITE_VIEW, baseURL);
- createImageDescriptor(ISharedImages.IMG_SITE_ELEMENT, baseURL);
+ createImageDescriptor(UIConstants.IMG_SITE_ELEMENT, baseURL);
// Sync View Icons
createImageDescriptor(UIConstants.IMG_DLG_SYNC_INCOMING, baseURL);

Back to the top