diff options
author | ddunne | 2010-01-07 17:47:46 +0000 |
---|---|---|
committer | ddunne | 2010-01-07 17:47:46 +0000 |
commit | 5a34e5c479ed29039538f1248e8e6c7d1ada90a6 (patch) | |
tree | 48e81b10da2d4a48b8c22d9f18283ed8e8b74c6e | |
parent | 84382818d7ad542533ea00a46eb107e78472952d (diff) | |
download | org.eclipse.osee-5a34e5c479ed29039538f1248e8e6c7d1ada90a6.tar.gz org.eclipse.osee-5a34e5c479ed29039538f1248e8e6c7d1ada90a6.tar.xz org.eclipse.osee-5a34e5c479ed29039538f1248e8e6c7d1ada90a6.zip |
fixed editor and hyperlink selection titles to truncate when too long
16 files changed, 61 insertions, 27 deletions
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/CurrentAssigneesXWidget.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/CurrentAssigneesXWidget.java index e74b9b2ae9b..27467c6d8e3 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/CurrentAssigneesXWidget.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/CurrentAssigneesXWidget.java @@ -33,7 +33,7 @@ public class CurrentAssigneesXWidget extends XHyperlinkLabelCmdValueSelection { private final boolean isEditable;
public CurrentAssigneesXWidget(IManagedForm managedForm, final StateMachineArtifact sma, Composite composite, int horizontalSpan, XModifiedListener xModListener, boolean isEditable) throws OseeStateException {
- super("Assignee(s)");
+ super("Assignee(s)", false, 80);
this.sma = sma;
this.isEditable = isEditable;
if (xModListener != null) {
@@ -81,7 +81,7 @@ public class CurrentAssigneesXWidget extends XHyperlinkLabelCmdValueSelection { } else {
setToolTip(sma.getStateMgr().getAssigneesStr());
setErrorState(false);
- return sma.getStateMgr().getAssigneesStr(80);
+ return sma.getStateMgr().getAssigneesStr();
}
} catch (OseeCoreException ex) {
OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java index a2134f9c0cb..d8e4bc5d7e0 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java @@ -18,11 +18,13 @@ import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.artifact.VersionArtifact;
import org.eclipse.osee.ats.artifact.VersionArtifact.VersionReleaseType;
import org.eclipse.osee.ats.util.widgets.XHyperlabelTeamDefinitionSelection;
+import org.eclipse.osee.ats.world.WorldEditor;
import org.eclipse.osee.ats.world.WorldEditorParameterSearchItem;
import org.eclipse.osee.ats.world.search.TeamWorldSearchItem;
import org.eclipse.osee.ats.world.search.TeamWorldSearchItem.ReleasedOption;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.User;
@@ -114,7 +116,7 @@ public class TeamWorkflowSearchWorkflowSearchItem extends WorldEditorParameterSe if (isIncludeCompletedCancelledCheckbox()) {
sb.append(" - Include Completed/Cancelled");
}
- return "Team Workflows" + sb.toString();
+ return Strings.truncate("Team Workflows" + sb.toString(), WorldEditor.TITLE_MAX_LENGTH, true);
}
@Override
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/UserSearchWorkflowSearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/UserSearchWorkflowSearchItem.java index 94c07e62644..1c1432ca0ee 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/UserSearchWorkflowSearchItem.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/UserSearchWorkflowSearchItem.java @@ -19,11 +19,13 @@ import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.artifact.VersionArtifact;
import org.eclipse.osee.ats.artifact.VersionArtifact.VersionReleaseType;
import org.eclipse.osee.ats.util.widgets.XHyperlabelTeamDefinitionSelection;
+import org.eclipse.osee.ats.world.WorldEditor;
import org.eclipse.osee.ats.world.WorldEditorParameterSearchItem;
import org.eclipse.osee.ats.world.search.UserWorldSearchItem;
import org.eclipse.osee.ats.world.search.UserWorldSearchItem.UserSearchOption;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.User;
@@ -161,7 +163,7 @@ public class UserSearchWorkflowSearchItem extends WorldEditorParameterSearchItem if (isTasksCheckbox()) {
sb.append(" - Tasks");
}
- return "User Search" + sb.toString();
+ return Strings.truncate("User Search" + sb.toString(), WorldEditor.TITLE_MAX_LENGTH, true);
}
@Override
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java index fb723fe8d3d..522d1d4b991 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java @@ -26,6 +26,7 @@ import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.util.AtsUtil;
import org.eclipse.osee.ats.world.AtsMetricsComposite;
import org.eclipse.osee.ats.world.IAtsMetricsProvider;
+import org.eclipse.osee.ats.world.WorldEditor;
import org.eclipse.osee.ats.world.WorldEditorParameterSearchItemProvider;
import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -59,6 +60,7 @@ public class TaskEditor extends AbstractArtifactEditor implements IDirtiableEdit private final Collection<TaskArtifact> tasks = new HashSet<TaskArtifact>();
private AtsMetricsComposite metricsComposite;
private boolean loading = false;
+ public static int TITLE_MAX_LENGTH = WorldEditor.TITLE_MAX_LENGTH;
@Override
public void doSave(IProgressMonitor monitor) {
@@ -251,11 +253,11 @@ public class TaskEditor extends AbstractArtifactEditor implements IDirtiableEdit private final SearchType searchType;
public LoadTableJob(ITaskEditorProvider itaskEditorProvider, SearchType searchType, TaskEditor taskEditor) throws OseeCoreException {
- super("Loading \"" + itaskEditorProvider.getTaskEditorLabel(searchType) + "\"...");
+ super("Loading \"" + itaskEditorProvider.getTaskEditorLabel(searchType) + "\"");
this.searchType = searchType;
this.taskEditor = taskEditor;
taskEditor.setPartName(itaskEditorProvider.getTaskEditorLabel(searchType));
- taskEditor.setTableTitle("Loading \"" + itaskEditorProvider.getTaskEditorLabel(searchType) + "\"...", false);
+ taskEditor.setTableTitle("Loading \"" + itaskEditorProvider.getTaskEditorLabel(searchType) + "\"", false);
this.itaskEditorProvider = itaskEditorProvider;
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditorParameterSearchItemProvider.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditorParameterSearchItemProvider.java index 4c403e69c50..f541fdd6b7d 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditorParameterSearchItemProvider.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditorParameterSearchItemProvider.java @@ -14,6 +14,7 @@ import java.util.Collection; import org.eclipse.nebula.widgets.xviewer.customize.CustomizeData;
import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption;
@@ -35,7 +36,7 @@ public class TaskEditorParameterSearchItemProvider extends TaskEditorProvider { @Override
public String getTaskEditorLabel(SearchType searchType) throws OseeCoreException {
- return taskParameterSearchItem.getTaskEditorLabel(searchType);
+ return Strings.truncate(taskParameterSearchItem.getTaskEditorLabel(searchType), TaskEditor.TITLE_MAX_LENGTH, true);
}
@Override
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditorSimpleProvider.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditorSimpleProvider.java index 2b0be1917b5..3bbf344cac3 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditorSimpleProvider.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditorSimpleProvider.java @@ -14,6 +14,7 @@ import java.util.Collection; import org.eclipse.nebula.widgets.xviewer.customize.CustomizeData;
import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption;
@@ -37,7 +38,7 @@ public class TaskEditorSimpleProvider extends TaskEditorProvider { @Override
public String getTaskEditorLabel(SearchType searchType) throws OseeCoreException {
- return name;
+ return Strings.truncate(name, TaskEditor.TITLE_MAX_LENGTH, true);
}
@Override
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelTeamDefinitionSelection.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelTeamDefinitionSelection.java index 5d5a08f3515..28c388730b3 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelTeamDefinitionSelection.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelTeamDefinitionSelection.java @@ -14,6 +14,7 @@ import java.util.Collection; import java.util.HashSet;
import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact;
import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionTreeWithChildrenDialog;
+import org.eclipse.osee.ats.world.WorldEditor;
import org.eclipse.osee.framework.core.enums.Active;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -35,7 +36,7 @@ public class XHyperlabelTeamDefinitionSelection extends XHyperlinkLabelCmdValueS * @param label
*/
public XHyperlabelTeamDefinitionSelection(String label) {
- super(label, true);
+ super(label, true, WorldEditor.TITLE_MAX_LENGTH);
}
public Collection<TeamDefinitionArtifact> getSelectedTeamDefintions() {
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java index 302f5541879..df3897d6a4d 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java @@ -51,6 +51,7 @@ public class WorldEditor extends FormEditor implements IWorldEditor, IDirtiableE private WorldXWidgetActionPage worldXWidgetActionPage;
private AtsMetricsComposite metricsComposite;
public static final String HELP_CONTEXT_ID = "atsWorldView";
+ public static int TITLE_MAX_LENGTH = 80;
@Override
public void doSave(IProgressMonitor monitor) {
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItemProvider.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItemProvider.java index b1067bf8c34..5cc62862394 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItemProvider.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItemProvider.java @@ -22,6 +22,7 @@ import org.eclipse.osee.ats.world.search.WorldSearchItem; import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
@@ -164,7 +165,7 @@ public class WorldEditorParameterSearchItemProvider extends WorldEditorProvider @Override
public String getSelectedName(SearchType searchType) throws OseeCoreException {
- return worldParameterSearchItem.getSelectedName(searchType);
+ return Strings.truncate(worldParameterSearchItem.getSelectedName(searchType), WorldEditor.TITLE_MAX_LENGTH, true);
}
@Override
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java index 1f5cf0f7606..08cbaea60fb 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java @@ -27,6 +27,7 @@ import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType; import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Collections;
+import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption;
@@ -67,7 +68,7 @@ public class WorldEditorUISearchItemProvider extends WorldEditorProvider { @Override
public String getSelectedName(SearchType searchType) throws OseeCoreException {
- return worldUISearchItem.getSelectedName(searchType);
+ return Strings.truncate(worldUISearchItem.getSelectedName(searchType), WorldEditor.TITLE_MAX_LENGTH, true);
}
@Override
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TaskSearchWorldSearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TaskSearchWorldSearchItem.java index f76d79273e2..4af1eeed37b 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TaskSearchWorldSearchItem.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TaskSearchWorldSearchItem.java @@ -24,6 +24,7 @@ import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.artifact.VersionArtifact;
import org.eclipse.osee.ats.artifact.VersionArtifact.VersionReleaseType;
import org.eclipse.osee.ats.task.ITaskEditorProvider;
+import org.eclipse.osee.ats.task.TaskEditor;
import org.eclipse.osee.ats.task.TaskEditorParameterSearchItem;
import org.eclipse.osee.ats.util.AtsRelationTypes;
import org.eclipse.osee.ats.util.widgets.XHyperlabelTeamDefinitionSelection;
@@ -32,6 +33,7 @@ import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Collections;
+import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.User;
@@ -172,8 +174,7 @@ public class TaskSearchWorldSearchItem extends TaskEditorParameterSearchItem { continue;
}
// If user is selected and not user is assigned, skip this task
- else if (getSelectedUser() != null && !taskArt.getStateMgr().getAssignees().contains(
- getSelectedUser())) {
+ else if (getSelectedUser() != null && !taskArt.getStateMgr().getAssignees().contains(getSelectedUser())) {
continue;
}
tasks.add(taskArt);
@@ -224,7 +225,7 @@ public class TaskSearchWorldSearchItem extends TaskEditorParameterSearchItem { if (isIncludeCompletedCancelledCheckbox()) {
sb.append(" - Include Completed/Cancelled");
}
- return "Tasks" + sb.toString();
+ return Strings.truncate("Tasks" + sb.toString(), TaskEditor.TITLE_MAX_LENGTH, true);
}
@Override
diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/widget/XHyperlabelCoverageMethodSelection.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/widget/XHyperlabelCoverageMethodSelection.java index da5fd970414..cdf33d2cdfd 100644 --- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/widget/XHyperlabelCoverageMethodSelection.java +++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/widget/XHyperlabelCoverageMethodSelection.java @@ -32,11 +32,11 @@ public class XHyperlabelCoverageMethodSelection extends XHyperlinkLabelCmdValueS CoverageOptionManager coverageOptionManager;
public XHyperlabelCoverageMethodSelection() {
- super("Coverage Methods", true);
+ super("Coverage Methods", true, 80);
}
public XHyperlabelCoverageMethodSelection(String label, CoverageOptionManager coverageOptionManager) {
- super(label, true);
+ super(label, true, 80);
this.coverageOptionManager = coverageOptionManager;
}
@@ -65,8 +65,7 @@ public class XHyperlabelCoverageMethodSelection extends XHyperlinkLabelCmdValueS @Override
public boolean handleSelection() {
try {
- dialog =
- new CoverageMethodListDialog(coverageOptionManager.getEnabled(), selectedCoverageMethods);
+ dialog = new CoverageMethodListDialog(coverageOptionManager.getEnabled(), selectedCoverageMethods);
int result = dialog.open();
if (result == 0) {
selectedCoverageMethods.clear();
diff --git a/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/Strings.java b/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/Strings.java index 8c0598f7531..27f5423d9f4 100644 --- a/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/Strings.java +++ b/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/Strings.java @@ -13,6 +13,7 @@ package org.eclipse.osee.framework.jdk.core.util; /**
* @author Jeff C. Phillips
+ * @author Don Dunne
*/
public class Strings {
private final static String EMPTY_STRING = "";
@@ -25,12 +26,20 @@ public class Strings { return EMPTY_STRING;
}
- public static String truncate(String value, int length) {
+ /**
+ * Will truncate string if necessary and add "..." to end if addDots and truncated
+ */
+ public static String truncate(String value, int length, boolean addDots) {
+ if (value == null) return "";
String toReturn = value;
if (Strings.isValid(value) && value.length() > length) {
- toReturn = value.substring(0, Math.min(length, value.length()));
+ toReturn = value.substring(0, Math.min(length, value.length())) + (addDots ? "..." : "");
}
return toReturn;
}
+ public static String truncate(String value, int length) {
+ return truncate(value, length, false);
+ }
+
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelGroupSelection.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelGroupSelection.java index e2d598088f9..53a2438db5a 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelGroupSelection.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelGroupSelection.java @@ -32,7 +32,7 @@ public class XHyperlabelGroupSelection extends XHyperlinkLabelCmdValueSelection * @param label */ public XHyperlabelGroupSelection(String label) { - super(label, true); + super(label, true, 80); } public Set<Artifact> getSelectedGroups() { diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelection.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelection.java index e08390c9599..57719942079 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelection.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelection.java @@ -26,11 +26,8 @@ public class XHyperlabelMemberSelection extends XHyperlinkLabelCmdValueSelection Set<User> selectedUsers = new HashSet<User>(); - /** - * @param label - */ public XHyperlabelMemberSelection(String label) { - super(label); + super(label, false, 80); } public Set<User> getSelectedUsers() { diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlinkLabelCmdValueSelection.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlinkLabelCmdValueSelection.java index eb25971ae93..7572e3c2dd4 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlinkLabelCmdValueSelection.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlinkLabelCmdValueSelection.java @@ -34,14 +34,20 @@ public abstract class XHyperlinkLabelCmdValueSelection extends XWidget { Label valueLabel; Hyperlink selectHyperLinkLabel, clearHyperLinkLabel; private final boolean supportClear; + private Integer truncateValueLength = null; public XHyperlinkLabelCmdValueSelection(String label) { this(label, false); } - public XHyperlinkLabelCmdValueSelection(String label, boolean supportClear) { + public XHyperlinkLabelCmdValueSelection(String label, boolean supportClear, Integer truncateValueLength) { super(label); this.supportClear = supportClear; + this.truncateValueLength = truncateValueLength; + } + + public XHyperlinkLabelCmdValueSelection(String label, boolean supportClear) { + this(label, supportClear, null); } public String getCurrentValue() { @@ -143,7 +149,9 @@ public abstract class XHyperlinkLabelCmdValueSelection extends XWidget { updated = true; } if (!getCurrentValue().equals(valueLabel.getText())) { - valueLabel.setText(getCurrentValue()); + valueLabel.setText(truncateValueLength == null ? getCurrentValue() : Strings.truncate(getCurrentValue(), + truncateValueLength, true)); + valueLabel.setToolTipText(getCurrentValue()); updated = true; } if (updated) { @@ -203,4 +211,12 @@ public abstract class XHyperlinkLabelCmdValueSelection extends XWidget { public void setXmlData(String str) { } + public Integer getTruncateValueLength() { + return truncateValueLength; + } + + public void setTruncateValueLength(Integer truncateValueLength) { + this.truncateValueLength = truncateValueLength; + } + } |