diff options
author | Uwe Stieber | 2011-12-08 15:28:35 +0000 |
---|---|---|
committer | Uwe Stieber | 2011-12-08 15:28:35 +0000 |
commit | c54cb44b59b5f480017727e989329d369cb2d024 (patch) | |
tree | f654d4ff88afa12ced7911a9066460ff613b8833 /target_explorer/plugins/org.eclipse.tcf.te.ui.controls | |
parent | 34d1fee8cb2460422ea1e228f841d5a2b2d5d584 (diff) | |
download | org.eclipse.tcf-c54cb44b59b5f480017727e989329d369cb2d024.tar.gz org.eclipse.tcf-c54cb44b59b5f480017727e989329d369cb2d024.tar.xz org.eclipse.tcf-c54cb44b59b5f480017727e989329d369cb2d024.zip |
Target Explorer: Minor te.ui.control plug-in re-organization
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.ui.controls')
-rw-r--r-- | target_explorer/plugins/org.eclipse.tcf.te.ui.controls/META-INF/MANIFEST.MF | 1 | ||||
-rw-r--r-- | target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/BaseEditBrowseTextControl.java | 1 | ||||
-rw-r--r-- | target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/DialogSettingsUtil.java | 115 | ||||
-rw-r--r-- | target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/file/DirectorySelectionControl.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/DirectorySelectionControl.java) | 3 | ||||
-rw-r--r-- | target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/file/FileSelectionControl.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/FileSelectionControl.java) | 3 |
5 files changed, 6 insertions, 117 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/META-INF/MANIFEST.MF index 75b6b5092..0754a5b05 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/META-INF/MANIFEST.MF @@ -17,6 +17,7 @@ Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Export-Package: org.eclipse.tcf.te.ui.controls, org.eclipse.tcf.te.ui.controls.activator;x-internal:=true, + org.eclipse.tcf.te.ui.controls.file, org.eclipse.tcf.te.ui.controls.interfaces, org.eclipse.tcf.te.ui.controls.net, org.eclipse.tcf.te.ui.controls.nls, diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/BaseEditBrowseTextControl.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/BaseEditBrowseTextControl.java index 5d47050c1..db14f4890 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/BaseEditBrowseTextControl.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/BaseEditBrowseTextControl.java @@ -45,6 +45,7 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.tcf.te.ui.controls.nls.Messages; import org.eclipse.tcf.te.ui.controls.validator.Validator; import org.eclipse.tcf.te.ui.swt.SWTControlUtil; +import org.eclipse.tcf.te.ui.utils.DialogSettingsUtil; import org.eclipse.tcf.te.ui.wizards.interfaces.IValidatableWizardPage; import org.eclipse.ui.forms.widgets.FormToolkit; diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/DialogSettingsUtil.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/DialogSettingsUtil.java deleted file mode 100644 index 301e7ee9e..000000000 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/DialogSettingsUtil.java +++ /dev/null @@ -1,115 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved. - * This program and the accompanying materials are made available under the terms - * of the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Wind River Systems - initial API and implementation - *******************************************************************************/ -package org.eclipse.tcf.te.ui.controls; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.eclipse.core.runtime.Assert; -import org.eclipse.jface.dialogs.IDialogSettings; - -/** - * Utility class providing static methods to centralize - * common operations to perform on JFace dialog settings. - */ -public class DialogSettingsUtil { - - /** - * Default number of entries within the combo box history. - */ - public static final int COMBO_HISTORY_LENGTH = 5; - - /** - * Empty array to be returned by {@link #getSettingsArraySafe(IDialogSettings, String)}. - */ - public static final String[] NO_ELEMENTS = new String[0]; - - /** - * Add the given new history entry to the given array of existing history entries. - * Empty history entries or <code>null</code> values will be ignored and not added. - * - * @param history The array containing the existing history entries. Must not be <code>null</code>! - * @param newEntry The new entry to add to the history list. - * - * @return The new list of history entries. - */ - public static String[] addToHistory(String[] history, String newEntry) { - Assert.isNotNull(history); - - // We have to create a new ArrayList from the transformed array. Otherwise - // modification of the list would not be supported (java.lang.UnsupportedOperationException). - List<String> historyList = new ArrayList<String>(Arrays.asList(history)); - addToHistory(historyList, newEntry); - history = historyList.toArray(new String[historyList.size()]); - - return history; - } - - /** - * Adds the given history entry to the given list of history entries at index 0. - * Consistency checks are performed for the resulting list. - */ - private static void addToHistory(List<String> history, String newEntry) { - // just ignore values and do not add them to the history. Null values cannot - // be handle by SWT controls (like Combobox). However, do not assert null values! - if (newEntry != null && newEntry.trim().length() > 0) { - // remove all entries which just are prefixes of the newEntry - // Avoid to flood the history with partial typed entries for early finish supporting connections! - StringBuffer entry = new StringBuffer(newEntry); - while (entry.length() > 0) { - history.remove(entry.toString()); - entry.deleteCharAt(entry.length() - 1); - } - history.add(0, newEntry); - - // since only one new item was added, we can be over the limit - // by at most one item - if (history.size() > COMBO_HISTORY_LENGTH) history.remove(COMBO_HISTORY_LENGTH); - } - } - - /** - * Return a string array from given dialog settings. <code>Null</code> values - * will be filtered out. - * - * @param settings The dialog settings. Must not be <code>null</code>. - * @param key The dialog settings attribute key. Must not be <code>null</code>. - * - * @return The string array or an empty array. - */ - public static String[] getSettingsArraySafe(IDialogSettings settings, String key) { - Assert.isNotNull(settings); - Assert.isNotNull(key); - - String[] result = null; - - String[] values = settings.getArray(key); - if (values != null && values.length > 0) { - boolean filtered = false; - List<String> filteredValue = new ArrayList<String>(values.length); - for (String value : values) { - if (value != null && value.trim().length() > 0) { - filteredValue.add(value); - } else { - filtered = true; - } - } - if (filtered) { - if (!filteredValue.isEmpty()) { - result = filteredValue.toArray(new String[filteredValue.size()]); - } - } else { - result = values; - } - } - return result != null ? result : NO_ELEMENTS; - } -} diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/DirectorySelectionControl.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/file/DirectorySelectionControl.java index 2c8417cd1..1543c1ae5 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/DirectorySelectionControl.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/file/DirectorySelectionControl.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.controls; +package org.eclipse.tcf.te.ui.controls.file; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.Platform; @@ -15,6 +15,7 @@ import org.eclipse.jface.dialogs.IDialogPage; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Dialog; import org.eclipse.swt.widgets.DirectoryDialog; +import org.eclipse.tcf.te.ui.controls.BaseDialogSelectionControl; import org.eclipse.tcf.te.ui.controls.nls.Messages; import org.eclipse.tcf.te.ui.controls.validator.DirectoryNameValidator; import org.eclipse.tcf.te.ui.controls.validator.Validator; diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/FileSelectionControl.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/file/FileSelectionControl.java index b656d06fd..80390e332 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/FileSelectionControl.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/file/FileSelectionControl.java @@ -7,7 +7,7 @@ * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ -package org.eclipse.tcf.te.ui.controls; +package org.eclipse.tcf.te.ui.controls.file; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IPath; @@ -18,6 +18,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Dialog; import org.eclipse.swt.widgets.FileDialog; +import org.eclipse.tcf.te.ui.controls.BaseDialogSelectionControl; import org.eclipse.tcf.te.ui.controls.nls.Messages; import org.eclipse.tcf.te.ui.controls.validator.FileNameValidator; import org.eclipse.tcf.te.ui.controls.validator.Validator; |