Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-04-08 09:13:56 -0400
committerMichael Valenta2002-04-08 09:13:56 -0400
commit8d809e5409d95ae216d6b5d1acbde70d3e3027c3 (patch)
treeec0ccbb9c860a490f0cf7077073507b7438d9119
parent1db8231d63e244b075363ff7c8985ea926008f07 (diff)
downloadeclipse.platform.team-8d809e5409d95ae216d6b5d1acbde70d3e3027c3.tar.gz
eclipse.platform.team-8d809e5409d95ae216d6b5d1acbde70d3e3027c3.tar.xz
eclipse.platform.team-8d809e5409d95ae216d6b5d1acbde70d3e3027c3.zip
12065: Error on "Change Tag" acts fatal when shouldn't be
- Removed "Change Tag"
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPropertiesPage.java65
1 files changed, 28 insertions, 37 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPropertiesPage.java
index 152aa1370..2e5432bf6 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPropertiesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPropertiesPage.java
@@ -1,10 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 200, 2002 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v0.5
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v05.html
+ *
+ * Contributors:
+ * IBM - Initial API and implementation
+ ******************************************************************************/
package org.eclipse.team.internal.ccvs.ui;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
import java.lang.reflect.InvocationTargetException;
import org.eclipse.core.resources.IProject;
@@ -73,47 +78,33 @@ public class CVSPropertiesPage extends PropertyPage {
layout.numColumns = 3;
composite.setLayout(layout);
- Label label = createLabel(composite, Policy.bind("CVSPropertiesPage.connectionType"), 1);
+ Label label = createLabel(composite, Policy.bind("CVSPropertiesPage.connectionType"), 1); //$NON-NLS-1$
methodType = createCombo(composite);
- label = createLabel(composite, Policy.bind("CVSPropertiesPage.user"), 1);
+ label = createLabel(composite, Policy.bind("CVSPropertiesPage.user"), 1); //$NON-NLS-1$
userText = createTextField(composite);
- label = createLabel(composite, Policy.bind("CVSPropertiesPage.password"), 1);
+ label = createLabel(composite, Policy.bind("CVSPropertiesPage.password"), 1); //$NON-NLS-1$
passwordText = createTextField(composite);
passwordText.setEchoChar('*');
- label = createLabel(composite, Policy.bind("CVSPropertiesPage.host"), 1);
- hostLabel = createLabel(composite, "", 2);
+ label = createLabel(composite, Policy.bind("CVSPropertiesPage.host"), 1); //$NON-NLS-1$
+ hostLabel = createLabel(composite, "", 2); //$NON-NLS-1$
- label = createLabel(composite, Policy.bind("CVSPropertiesPage.port"), 1);
- portLabel = createLabel(composite, "", 2);
+ label = createLabel(composite, Policy.bind("CVSPropertiesPage.port"), 1); //$NON-NLS-1$
+ portLabel = createLabel(composite, "", 2); //$NON-NLS-1$
- label = createLabel(composite, Policy.bind("CVSPropertiesPage.path"), 1);
- pathLabel = createLabel(composite, "", 2);
+ label = createLabel(composite, Policy.bind("CVSPropertiesPage.path"), 1); //$NON-NLS-1$
+ pathLabel = createLabel(composite, "", 2); //$NON-NLS-1$
- label = createLabel(composite, Policy.bind("CVSPropertiesPage.module"), 1);
- moduleLabel = createLabel(composite, "", 2);
+ label = createLabel(composite, Policy.bind("CVSPropertiesPage.module"), 1); //$NON-NLS-1$
+ moduleLabel = createLabel(composite, "", 2); //$NON-NLS-1$
- label = createLabel(composite, Policy.bind("CVSPropertiesPage.tag"), 1);
- tagLabel = createLabel(composite, "", 1);
+ label = createLabel(composite, Policy.bind("CVSPropertiesPage.tag"), 1); //$NON-NLS-1$
+ tagLabel = createLabel(composite, "", 1); //$NON-NLS-1$
GridData data = new GridData(GridData.FILL_HORIZONTAL);
tagLabel.setLayoutData(data);
- Button changeTag = new Button(composite, SWT.PUSH);
- data = new GridData(GridData.HORIZONTAL_ALIGN_END);
- changeTag.setLayoutData(data);
- changeTag.setText(Policy.bind("CVSPropertiesPage.update"));
- changeTag.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event event) {
- UpdateWizard wizard = new UpdateWizard();
- wizard.setProject(project);
- WizardDialog dialog = new WizardDialog(getShell(), wizard);
- dialog.open();
- initializeTag();
- }
- });
-
initializeValues();
passwordText.addListener(SWT.Modify, new Listener() {
public void handleEvent(Event event) {
@@ -220,7 +211,7 @@ public class CVSPropertiesPage extends PropertyPage {
} catch (TeamException e) {
handle(e);
}
- passwordText.setText("*********");
+ passwordText.setText("*********"); //$NON-NLS-1$
try {
ICVSRemoteResource resource = cvsRoot.getRemoteResourceFor(project);
@@ -228,9 +219,9 @@ public class CVSPropertiesPage extends PropertyPage {
hostLabel.setText(location.getHost());
int port = location.getPort();
if (port == ICVSRepositoryLocation.USE_DEFAULT_PORT) {
- portLabel.setText(Policy.bind("CVSPropertiesPage.defaultPort"));
+ portLabel.setText(Policy.bind("CVSPropertiesPage.defaultPort")); //$NON-NLS-1$
} else {
- portLabel.setText("" + port);
+ portLabel.setText("" + port); //$NON-NLS-1$
}
pathLabel.setText(location.getRootDirectory());
moduleLabel.setText(resource.getRepositoryRelativePath());
@@ -250,7 +241,7 @@ public class CVSPropertiesPage extends PropertyPage {
CVSTag tag = local.getFolderSyncInfo().getTag();
String tagName;
if (tag == null) {
- tagName = "HEAD";
+ tagName = CVSTag.DEFAULT.getName();
} else {
tagName = tag.getName();
}
@@ -288,7 +279,7 @@ public class CVSPropertiesPage extends PropertyPage {
} else if (t instanceof CoreException) {
handle(((CoreException)t).getStatus());
} else {
- IStatus status = new Status(IStatus.ERROR, CVSUIPlugin.ID, 1, "Internal error occured", t);
+ IStatus status = new Status(IStatus.ERROR, CVSUIPlugin.ID, 1, Policy.bind("internal"), t); //$NON-NLS-1$
handle(status);
CVSUIPlugin.log(status);
}

Back to the top