commit e2154667641afbd804df477573abe41a5332e1e9 Author: Mauro Talevi <mauro.tal...@aquilonia.org> AuthorDate: Tue Jul 10 10:48:06 2012 +0200 Commit: Mauro Talevi <mauro.tal...@aquilonia.org> CommitDate: Tue Jul 10 10:48:06 2012 +0200
JBEHAVE-233: Moved TextProvider interface. diff --git a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/PatternViewFilter.java b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/PatternViewFilter.java index 6f8ad6f..5c0eace 100644 --- a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/PatternViewFilter.java +++ b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/PatternViewFilter.java @@ -18,7 +18,7 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; -import org.jbehave.eclipse.util.TextProvider; +import org.jbehave.eclipse.editor.text.TextProvider; /** * PatternViewFilter diff --git a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/outline/QuickOutlinePopupDialog.java b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/outline/QuickOutlinePopupDialog.java index d2933e1..016c9e3 100644 --- a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/outline/QuickOutlinePopupDialog.java +++ b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/outline/QuickOutlinePopupDialog.java @@ -28,8 +28,8 @@ import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; import org.jbehave.eclipse.editor.story.PatternViewFilter; import org.jbehave.eclipse.editor.story.StoryEditor; +import org.jbehave.eclipse.editor.text.TextProvider; import org.jbehave.eclipse.util.Strings; -import org.jbehave.eclipse.util.TextProvider; public class QuickOutlinePopupDialog extends PopupDialog { diff --git a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/outline/QuickOutlineStyledLabelProvider.java b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/outline/QuickOutlineStyledLabelProvider.java index 217530b..50ab2af 100644 --- a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/outline/QuickOutlineStyledLabelProvider.java +++ b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/outline/QuickOutlineStyledLabelProvider.java @@ -8,7 +8,7 @@ import org.eclipse.jface.viewers.StyledString; import org.eclipse.jface.viewers.ViewerCell; import org.jbehave.eclipse.ImageIds; import org.jbehave.eclipse.editor.story.StoryPartition; -import org.jbehave.eclipse.util.TextProvider; +import org.jbehave.eclipse.editor.text.TextProvider; public class QuickOutlineStyledLabelProvider extends StyledCellLabelProvider implements TextProvider { diff --git a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/quicksearch/QuickSearchPopupDialog.java b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/quicksearch/QuickSearchPopupDialog.java index d51c3e0..36f9a3f 100644 --- a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/quicksearch/QuickSearchPopupDialog.java +++ b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/quicksearch/QuickSearchPopupDialog.java @@ -34,9 +34,9 @@ import org.eclipse.ui.PlatformUI; import org.jbehave.eclipse.editor.step.StepCandidate; import org.jbehave.eclipse.editor.story.PatternViewFilter; import org.jbehave.eclipse.editor.story.StoryEditor; +import org.jbehave.eclipse.editor.text.TextProvider; import org.jbehave.eclipse.util.Lists; import org.jbehave.eclipse.util.Strings; -import org.jbehave.eclipse.util.TextProvider; public class QuickSearchPopupDialog extends PopupDialog { diff --git a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/quicksearch/QuickSearchStyledLabelProvider.java b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/quicksearch/QuickSearchStyledLabelProvider.java index c7f609d..26e2104 100644 --- a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/quicksearch/QuickSearchStyledLabelProvider.java +++ b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/quicksearch/QuickSearchStyledLabelProvider.java @@ -9,7 +9,7 @@ import org.eclipse.jface.viewers.StyledString; import org.eclipse.jface.viewers.ViewerCell; import org.jbehave.eclipse.ImageIds; import org.jbehave.eclipse.editor.step.StepCandidate; -import org.jbehave.eclipse.util.TextProvider; +import org.jbehave.eclipse.editor.text.TextProvider; public class QuickSearchStyledLabelProvider extends StyledCellLabelProvider implements TextProvider { diff --git a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/text/TextProvider.java b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/text/TextProvider.java new file mode 100644 index 0000000..180192c --- /dev/null +++ b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/text/TextProvider.java @@ -0,0 +1,5 @@ +package org.jbehave.eclipse.editor.text; + +public interface TextProvider { + String textOf(Object element); +} diff --git a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/util/TextProvider.java b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/util/TextProvider.java deleted file mode 100644 index f7406cc..0000000 --- a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/util/TextProvider.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jbehave.eclipse.util; - -public interface TextProvider { - String textOf(Object element); -}