From ae2e2cc15dff1e9fd9f9f5f5dc6d5a09144d9944 Mon Sep 17 00:00:00 2001 From: "hyunsik.noh" Date: Wed, 16 Nov 2011 12:46:47 +0900 Subject: [PATCH] [Title] check validation for file name in connection explorer [Type] Feature [Module] common [Priority] Minor [Redmine#] #3135 --- .../slp/common/connection/ui/ConnectionExplorer.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/com.samsung.slp.common.connection/src/com/samsung/slp/common/connection/ui/ConnectionExplorer.java b/com.samsung.slp.common.connection/src/com/samsung/slp/common/connection/ui/ConnectionExplorer.java index e3b383b..5866f82 100644 --- a/com.samsung.slp.common.connection/src/com/samsung/slp/common/connection/ui/ConnectionExplorer.java +++ b/com.samsung.slp.common.connection/src/com/samsung/slp/common/connection/ui/ConnectionExplorer.java @@ -10,6 +10,7 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.dialogs.IInputValidator; import org.eclipse.jface.dialogs.InputDialog; import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; @@ -73,6 +74,7 @@ public class ConnectionExplorer extends ViewPart implements ISelectionListener { private static final String EMULATOR_BATCH= "emulator.bat"; private static final String EMULATOR_BINARY= "emulator"; private static final String EMULATOR_PID_PATH = "conf" + File.separatorChar + "emulator.pid"; + private String INVALID_FOR_FILENAME = ";"; public ConnectionExplorer() { @@ -153,7 +155,7 @@ public class ConnectionExplorer extends ViewPart implements ISelectionListener { } private void actionAddFile(){ InputDialog addNewDialog = new InputDialog(Display.getCurrent().getActiveShell(), - "New File Resource", "New File Name: ", "" , null); + "New File Resource", "New File Name: ", "" , new FileNameValidator()); if( addNewDialog.open() == Window.OK) { mPanel.addNewFileSelection(currentFileEntry, addNewDialog.getValue()); @@ -188,7 +190,7 @@ public class ConnectionExplorer extends ViewPart implements ISelectionListener { } private void actionRename() { InputDialog renameDialog = new InputDialog(Display.getCurrent().getActiveShell(), - "Rename Resource", "New name: ", currentFileEntry.getName() , null); + "Rename Resource", "New name: ", currentFileEntry.getName() , new FileNameValidator()); if( renameDialog.open() == Window.OK) { mPanel.renameSelection(currentFileEntry, renameDialog.getValue()); @@ -556,4 +558,16 @@ public class ConnectionExplorer extends ViewPart implements ISelectionListener { else return null; } + + class FileNameValidator implements IInputValidator + { + + @Override + public String isValid(String newText) { + if( newText.contains(INVALID_FOR_FILENAME)) + return "\"" + INVALID_FOR_FILENAME + "\" is invalid character for file name."; + return null; + } + + } } \ No newline at end of file -- 2.7.4