Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2002-02-25 16:35:52 -0500
committerJean Michel-Lemieux2002-02-25 16:35:52 -0500
commit93bcba1719fd2c91fe17d719917de5aae535adc2 (patch)
tree8ff64220327703db66b5c451a9c83fbd575e3efc
parentc7555bb2b89ac2b99cf3ba11715ff832316a1463 (diff)
downloadeclipse.platform.team-93bcba1719fd2c91fe17d719917de5aae535adc2.tar.gz
eclipse.platform.team-93bcba1719fd2c91fe17d719917de5aae535adc2.tar.xz
eclipse.platform.team-93bcba1719fd2c91fe17d719917de5aae535adc2.zip
ext connection method fixes: NLS, added registration in plugin.xml
-rw-r--r--bundles/org.eclipse.team.cvs.core/plugin.xml.off8
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/ExtConnection.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java20
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties9
4 files changed, 28 insertions, 11 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/plugin.xml.off b/bundles/org.eclipse.team.cvs.core/plugin.xml.off
index aeeb216e4..94296332d 100644
--- a/bundles/org.eclipse.team.cvs.core/plugin.xml.off
+++ b/bundles/org.eclipse.team.cvs.core/plugin.xml.off
@@ -30,6 +30,14 @@
</run>
</adapter>
</extension>
+
+ <extension id="ext" point="org.eclipse.team.cvs.core.connectionmethods">
+ <adapter>
+ <run class="org.eclipse.team.internal.ccvs.core.connection.ExtConnectionMethod">
+ <parameter name="trace" value="false" />
+ </run>
+ </adapter>
+ </extension>
<!-- *************** Team Provider **************** -->
<extension id="CVSProvider" point="org.eclipse.team.core.providers">
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/ExtConnection.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/ExtConnection.java
index 36caf9fc7..b3de2471a 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/ExtConnection.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/ExtConnection.java
@@ -82,7 +82,7 @@ public class ExtConnection implements IServerConnection {
String CVS_RSH = CVSProviderPlugin.getPlugin().getCvsRshCommand();
String CVS_SERVER = CVSProviderPlugin.getPlugin().getCvsServer();
- String[] command = new String[] {CVS_RSH, "-l", username, hostname, CVS_SERVER, INVOKE_SVR_CMD}; //$NON-NLS-1$
+ String[] command = new String[] {CVS_RSH, hostname, "-l", username, CVS_SERVER, INVOKE_SVR_CMD}; //$NON-NLS-1$
int port = location.getPort();
if (port == location.USE_DEFAULT_PORT)
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java
index ec71ca748..3845fcc7f 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java
@@ -22,6 +22,7 @@ import org.eclipse.swt.widgets.Text;
import org.eclipse.team.ccvs.core.CVSProviderPlugin;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.eclipse.team.internal.ccvs.ui.Policy;
public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
@@ -39,7 +40,7 @@ public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenc
composite.setLayoutData(new GridData());
Label intro = new Label(composite, SWT.LEFT);
- intro.setText("These variables define the external connection program to use with the 'ext' connection method.\nThese values should be the same as the 'ext' CVS command-line environment variable settings.");
+ intro.setText(Policy.bind("ExtMethodPreferencePage_message")); //$NON-NLS-1$
GridData data = new GridData();
data.horizontalSpan = 3;
data.horizontalAlignment = GridData.FILL;
@@ -47,17 +48,17 @@ public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenc
new Label(composite, SWT.NULL); new Label(composite, SWT.NULL); new Label(composite, SWT.NULL); // spacer
- new Label(composite, SWT.LEFT).setText("CVS_RSH:");
+ new Label(composite, SWT.LEFT).setText(Policy.bind("ExtMethodPreferencePage_CVS_RSH")); //$NON-NLS-1$
cvsRsh = new Text(composite, SWT.BORDER);
cvsRsh.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
final Button b = new Button(composite, SWT.NONE);
- b.setText("Browse...");
+ b.setText(Policy.bind("ExtMethodPreferencePage_Browse")); //$NON-NLS-1$
b.setLayoutData(new GridData());
b.addListener(SWT.MouseDown, new Listener() {
public void handleEvent (Event event) {
FileDialog d = new FileDialog(getShell());
- d.setText("Select a program or script");
+ d.setText(Policy.bind("ExtMethodPreferencePage_Details")); //$NON-NLS-1$
String file = d.open();
if(file!=null) {
setCvsRshText(file);
@@ -67,11 +68,11 @@ public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenc
Label l = new Label(composite, SWT.LEFT | SWT.BOLD);
- l.setText("Note:");
+ l.setText(Policy.bind("ExtMethodPreferencePage_Note__5")); //$NON-NLS-1$
l.setFont(JFaceResources.getBannerFont());
l = new Label(composite, SWT.LEFT);
- l.setText("The RSH command must fit the following calling pattern:\n<CVS_RSH> -l <USERNAME> <HOST> <CVS_SERVER>\nThis program will be called to connect to the remote CVS server.");
+ l.setText(Policy.bind("ExtMethodPreferencePage_note_CVS_RSH")); //$NON-NLS-1$
data = new GridData();
data.horizontalSpan = 2;
data.horizontalAlignment = GridData.FILL;
@@ -79,7 +80,7 @@ public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenc
new Label(composite, SWT.NULL); new Label(composite, SWT.NULL); new Label(composite, SWT.NULL); // spacer
- new Label(composite, SWT.LEFT).setText("CVS_SERVER:");
+ new Label(composite, SWT.LEFT).setText(Policy.bind("ExtMethodPreferencePage_CVS_SERVER__7")); //$NON-NLS-1$
cvsServer = new Text(composite, SWT.BORDER);
data = new GridData();
data.horizontalSpan = 2;
@@ -87,11 +88,11 @@ public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenc
cvsServer.setLayoutData(data);
l = new Label(composite, SWT.LEFT | SWT.BOLD);
- l.setText("Note:");
+ l.setText(Policy.bind("ExtMethodPreferencePage_Note__8")); //$NON-NLS-1$
l.setFont(JFaceResources.getBannerFont());
l = new Label(composite, SWT.LEFT);
- l.setText("This is the name of the remote CVS server program.\nChange this setting only if the remote CVS server name\nis different than the default.");
+ l.setText(Policy.bind("ExtMethodPreferencePage_NoteForCVS_SERVER")); //$NON-NLS-1$
data = new GridData();
data.horizontalSpan = 2;
data.horizontalAlignment = GridData.FILL;
@@ -139,5 +140,4 @@ public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenc
protected IPreferenceStore doGetPreferenceStore() {
return CVSUIPlugin.getPlugin().getPreferenceStore();
}
-
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
index 39d9553e0..90842d50d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
@@ -400,3 +400,12 @@ flag_indicating_that_the_file_has_been_added_to_the_server_47=flag indicating th
ReplaceWithAction.Confirm_Overwrite_3=Confirm Overwrite
+ExtMethodPreferencePage_message=These variables define the external connection program to use with the \'ext\' connection method.\nThese values should be the same as the \'ext\' CVS command-line environment variable settings
+ExtMethodPreferencePage_CVS_RSH=CVS_RSH:
+ExtMethodPreferencePage_Browse=Browse
+ExtMethodPreferencePage_Details=Select a program or script
+ExtMethodPreferencePage_Note__5=Note:
+ExtMethodPreferencePage_note_CVS_RSH=The RSH command must fit the following calling pattern:\n<CVS_RSH> <HOST> -l <USERNAME> <CVS_SERVER>\nThis program will be called to connect to the remote CVS server
+ExtMethodPreferencePage_CVS_SERVER__7=CVS_SERVER:
+ExtMethodPreferencePage_Note__8=Note:
+ExtMethodPreferencePage_NoteForCVS_SERVER=This is the name of the remote CVS server program.\nChange this setting only if the remote CVS server name\nis different than the default

Back to the top