mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-19 14:15:50 +02:00
Code Issues Wiki Activity

[183772] patch for using ValidatorFileUniqueName

Browse source
This commit is contained in:
David McKnight 2007-05-07 18:54:37 +00:00
parent 2bfb3ccad2
commit 22544b6dc2
2 changed files with 8 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFileWizardMainPage.java
View file

@ -11,6 +11,7 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* Kevin Doyle (IBM) - Changed name Validator to ValidatorFileUniqueName
* {Name} (company) - description of contribution. * {Name} (company) - description of contribution.
********************************************************************************/ ********************************************************************************/
@ -25,12 +26,12 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileChildrenContentsType; import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileChildrenContentsType;
import org.eclipse.rse.subsystems.files.core.util.ValidatorFileUniqueName;
import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.messages.ISystemMessageLine;
import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ISystemValidator;
import org.eclipse.rse.ui.validators.ValidatorFileName;
import org.eclipse.rse.ui.wizards.AbstractSystemWizardPage; import org.eclipse.rse.ui.wizards.AbstractSystemWizardPage;
import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.ModifyListener;
@ -132,36 +133,11 @@ public class SystemNewFileWizardMainPage
if (parentFolders != null && parentFolders.length > 0) if (parentFolders != null && parentFolders.length > 0)
{ {
IRemoteFile parentFolder = parentFolders[0]; IRemoteFile parentFolder = parentFolders[0];
try nameValidator = new ValidatorFileUniqueName(getShell(),parentFolder,false);
{
Object[] contents = null;
if (parentFolder.isStale())
{
contents = parentFolder.getParentRemoteFileSubSystem().resolveFilterString(new NullProgressMonitor(), parentFolder, "*");
}
else
{
contents = parentFolder.getContents(RemoteFileChildrenContentsType.getInstance());
}
Vector names = new Vector();
for (int i = 0; i < contents.length; i++)
{
IRemoteFile child = (IRemoteFile)contents[i];
if (child.isFile())
{
names.add(child.getName());
}
}
nameValidator = new ValidatorFileName(names);
}
catch (Exception e)
{
}
} }
else else
{ {
nameValidator = new ValidatorFileName(); nameValidator = null;
} }
if ((parentFolders == null) || (parentFolders.length == 0)) if ((parentFolders == null) || (parentFolders.length == 0))

32
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFolderWizardMainPage.java
View file

@ -11,6 +11,7 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* Kevin Doyle (IBM) - Changed name Validator to ValidatorFileUniqueName
* {Name} (company) - description of contribution. * {Name} (company) - description of contribution.
********************************************************************************/ ********************************************************************************/
@ -25,12 +26,12 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileChildrenContentsType; import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileChildrenContentsType;
import org.eclipse.rse.subsystems.files.core.util.ValidatorFileUniqueName;
import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.messages.ISystemMessageLine;
import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ISystemValidator;
import org.eclipse.rse.ui.validators.ValidatorFileName;
import org.eclipse.rse.ui.validators.ValidatorUniqueString; import org.eclipse.rse.ui.validators.ValidatorUniqueString;
import org.eclipse.rse.ui.wizards.AbstractSystemWizardPage; import org.eclipse.rse.ui.wizards.AbstractSystemWizardPage;
import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyEvent;
@ -135,36 +136,11 @@ public class SystemNewFolderWizardMainPage
if (parentFolders != null && parentFolders.length > 0) if (parentFolders != null && parentFolders.length > 0)
{ {
IRemoteFile parentFolder = parentFolders[0]; IRemoteFile parentFolder = parentFolders[0];
try nameValidator = new ValidatorFileUniqueName(getShell(),parentFolder, true);
{
Object[] contents = null;
if (parentFolder.isStale())
{
contents = parentFolder.getParentRemoteFileSubSystem().resolveFilterString(new NullProgressMonitor(), parentFolder, "*");
}
else
{
contents = parentFolder.getContents(RemoteFileChildrenContentsType.getInstance());
}
Vector names = new Vector();
for (int i = 0; i < contents.length; i++)
{
IRemoteFile child = (IRemoteFile)contents[i];
if (!child.isFile())
{
names.add(child.getName());
}
}
nameValidator = new ValidatorFileName(names);
}
catch (Exception e)
{
}
} }
else else
{ {
nameValidator = new ValidatorFileName(); nameValidator = null;
} }
if (parentFolders == null) if (parentFolders == null)
{ {