diff options
author | Lars Vogel | 2018-06-04 10:04:50 +0000 |
---|---|---|
committer | Lars Vogel | 2018-06-04 10:05:53 +0000 |
commit | 5603f0c702ee27dc07ff6bd8dccd6928fdc1d882 (patch) | |
tree | 861f79ff17167c0d13a6c7fa17dad76853a014cb | |
parent | d571994b35dc7f1f911e7f2fd14ee7f304803b1d (diff) | |
download | eclipse.platform.ua-5603f0c702ee27dc07ff6bd8dccd6928fdc1d882.tar.gz eclipse.platform.ua-5603f0c702ee27dc07ff6bd8dccd6928fdc1d882.tar.xz eclipse.platform.ua-5603f0c702ee27dc07ff6bd8dccd6928fdc1d882.zip |
Bug 535437 - [Tips] Run cleanup actions to tips and enhance save actions
Change-Id: I0d1741a53928df3c82828bac83b470f5cc756ce2
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
17 files changed, 69 insertions, 57 deletions
diff --git a/org.eclipse.tips.core/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.tips.core/.settings/org.eclipse.jdt.ui.prefs index 52fe6a983..db3cbd40a 100644 --- a/org.eclipse.tips.core/.settings/org.eclipse.jdt.ui.prefs +++ b/org.eclipse.tips.core/.settings/org.eclipse.jdt.ui.prefs @@ -14,7 +14,7 @@ sp_cleanup.always_use_parentheses_in_expressions=false sp_cleanup.always_use_this_for_non_static_field_access=false sp_cleanup.always_use_this_for_non_static_method_access=false sp_cleanup.convert_functional_interfaces=true -sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.convert_to_enhanced_for_loop=true sp_cleanup.correct_indentation=false sp_cleanup.format_source_code=true sp_cleanup.format_source_code_changes_only=true @@ -34,14 +34,14 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class= sp_cleanup.qualify_static_member_accesses_with_declaring_class=false sp_cleanup.qualify_static_method_accesses_with_declaring_class=false sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_modifiers=false +sp_cleanup.remove_redundant_modifiers=true sp_cleanup.remove_redundant_type_arguments=true sp_cleanup.remove_trailing_whitespaces=true sp_cleanup.remove_trailing_whitespaces_all=true sp_cleanup.remove_trailing_whitespaces_ignore_empty=false sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unnecessary_nls_tags=true +sp_cleanup.remove_unused_imports=true sp_cleanup.remove_unused_local_variables=false sp_cleanup.remove_unused_private_fields=true sp_cleanup.remove_unused_private_members=false @@ -50,7 +50,7 @@ sp_cleanup.remove_unused_private_types=true sp_cleanup.sort_members=false sp_cleanup.sort_members_all=false sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_blocks=false +sp_cleanup.use_blocks=true sp_cleanup.use_blocks_only_for_return_and_throw=false sp_cleanup.use_lambda=true sp_cleanup.use_parentheses_in_expressions=false diff --git a/org.eclipse.tips.core/src/org/eclipse/tips/core/IHtmlTip.java b/org.eclipse.tips.core/src/org/eclipse/tips/core/IHtmlTip.java index b6373111a..f0cc9118d 100644 --- a/org.eclipse.tips.core/src/org/eclipse/tips/core/IHtmlTip.java +++ b/org.eclipse.tips.core/src/org/eclipse/tips/core/IHtmlTip.java @@ -24,7 +24,7 @@ public interface IHtmlTip { * @return the HMTL of the tip * @see #getImage() */ - public String getHTML(); + String getHTML(); /** * Returns the {@link TipImage}. @@ -32,6 +32,6 @@ public interface IHtmlTip { * @return a TipImage with information about the image or <code>null</code> if the this information cannot be created * @see #getHTML() */ - public TipImage getImage(); + TipImage getImage(); } diff --git a/org.eclipse.tips.core/src/org/eclipse/tips/core/ITipManager.java b/org.eclipse.tips.core/src/org/eclipse/tips/core/ITipManager.java index 8e2e64983..82fc2dfa1 100644 --- a/org.eclipse.tips.core/src/org/eclipse/tips/core/ITipManager.java +++ b/org.eclipse.tips.core/src/org/eclipse/tips/core/ITipManager.java @@ -25,7 +25,7 @@ public interface ITipManager { * @return true or false * @see TipManager#setServeReadTips(boolean) */ - public boolean mustServeReadTips(); + boolean mustServeReadTips(); /** * Consults TipManager to determine the Tip's read status. @@ -33,7 +33,7 @@ public interface ITipManager { * @param tip the tip to query for its read status * @return true if the tip is read, false otherwise. */ - public abstract boolean isRead(Tip tip); + boolean isRead(Tip tip); /** * Instructs the TipManager to mark this tip as read. @@ -41,7 +41,7 @@ public interface ITipManager { * @param tip the tip to set as read. * @return this */ - public abstract ITipManager setAsRead(Tip tip); + ITipManager setAsRead(Tip tip); /** * Central place of logging for the Tip Framework. @@ -49,7 +49,7 @@ public interface ITipManager { * @param status the {@link IStatus} which may not be null * @return this */ - public ITipManager log(IStatus status); + ITipManager log(IStatus status); /** * Binds the passed provider to this manager. After registration, ITipManager @@ -60,7 +60,7 @@ public interface ITipManager { * @param provider the {@link TipProvider} to register which may not be null. * @return this */ - public ITipManager register(TipProvider provider); + ITipManager register(TipProvider provider); /** * Opens the Tip of the Day dialog. @@ -74,14 +74,14 @@ public interface ITipManager { * * @see #isOpen() */ - public ITipManager open(boolean startUp); + ITipManager open(boolean startUp); /** * Returns the open state. * * @return true if this manager is open, false otherwise. */ - public boolean isOpen(); + boolean isOpen(); /** * Indicates if this manager has providers with unread tips. Be aware that @@ -91,5 +91,5 @@ public interface ITipManager { * @return true if this {@link TipManager} has providers with tips. * @see TipProvider#getTips() */ - public boolean hasContent(); + boolean hasContent(); }
\ No newline at end of file diff --git a/org.eclipse.tips.core/src/org/eclipse/tips/core/IUrlTip.java b/org.eclipse.tips.core/src/org/eclipse/tips/core/IUrlTip.java index 497d76cca..106cab26d 100644 --- a/org.eclipse.tips.core/src/org/eclipse/tips/core/IUrlTip.java +++ b/org.eclipse.tips.core/src/org/eclipse/tips/core/IUrlTip.java @@ -27,5 +27,5 @@ public interface IUrlTip { * @return the string representation of URL to the (remote) content * */ - public String getURL(); + String getURL(); }
\ No newline at end of file diff --git a/org.eclipse.tips.core/src/org/eclipse/tips/core/Tip.java b/org.eclipse.tips.core/src/org/eclipse/tips/core/Tip.java index 30c3831b0..ec887af97 100644 --- a/org.eclipse.tips.core/src/org/eclipse/tips/core/Tip.java +++ b/org.eclipse.tips.core/src/org/eclipse/tips/core/Tip.java @@ -76,28 +76,37 @@ public abstract class Tip { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } Tip other = (Tip) obj; if (getCreationDate() == null) { - if (other.getCreationDate() != null) + if (other.getCreationDate() != null) { return false; - } else if (!getCreationDate().equals(other.getCreationDate())) + } + } else if (!getCreationDate().equals(other.getCreationDate())) { return false; + } if (providerId == null) { - if (other.providerId != null) + if (other.providerId != null) { return false; - } else if (!providerId.equals(other.providerId)) + } + } else if (!providerId.equals(other.providerId)) { return false; + } if (getSubject() == null) { - if (other.getSubject() != null) + if (other.getSubject() != null) { return false; - } else if (!getSubject().equals(other.getSubject())) + } + } else if (!getSubject().equals(other.getSubject())) { return false; + } return true; } }
\ No newline at end of file diff --git a/org.eclipse.tips.core/src/org/eclipse/tips/core/TipProvider.java b/org.eclipse.tips.core/src/org/eclipse/tips/core/TipProvider.java index b5d0dff41..86221f385 100644 --- a/org.eclipse.tips.core/src/org/eclipse/tips/core/TipProvider.java +++ b/org.eclipse.tips.core/src/org/eclipse/tips/core/TipProvider.java @@ -230,7 +230,7 @@ public abstract class TipProvider { /** * A convenience method to get the list of tips based on the read status of the * tip and the requirement to serve unread or all tips. - * + * * @return the list of tips based on the description above * @see ITipManager#mustServeReadTips() * @see ITipManager#isRead(Tip) @@ -272,7 +272,7 @@ public abstract class TipProvider { // if (!getManager().isOpen()) { // return this; // } - getManager().log(LogUtil.info(Messages.TipProvider_0)); + getManager().log(LogUtil.info(Messages.TipProvider_0)); doSetTips(tips, true); fReady = true; fChangeSupport.firePropertyChange(PROP_READY, false, true); diff --git a/org.eclipse.tips.core/src/org/eclipse/tips/core/internal/TipManager.java b/org.eclipse.tips.core/src/org/eclipse/tips/core/internal/TipManager.java index f466dd330..75c2f208b 100644 --- a/org.eclipse.tips.core/src/org/eclipse/tips/core/internal/TipManager.java +++ b/org.eclipse.tips.core/src/org/eclipse/tips/core/internal/TipManager.java @@ -233,8 +233,9 @@ public abstract class TipManager implements ITipManager { @Override public boolean isOpen() { // checkDisposed(); - if (isDisposed()) + if (isDisposed()) { return false; + } return fOpen; } diff --git a/org.eclipse.tips.examples/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.tips.examples/.settings/org.eclipse.jdt.ui.prefs index 52fe6a983..def5bb091 100644 --- a/org.eclipse.tips.examples/.settings/org.eclipse.jdt.ui.prefs +++ b/org.eclipse.tips.examples/.settings/org.eclipse.jdt.ui.prefs @@ -14,7 +14,7 @@ sp_cleanup.always_use_parentheses_in_expressions=false sp_cleanup.always_use_this_for_non_static_field_access=false sp_cleanup.always_use_this_for_non_static_method_access=false sp_cleanup.convert_functional_interfaces=true -sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.convert_to_enhanced_for_loop=true sp_cleanup.correct_indentation=false sp_cleanup.format_source_code=true sp_cleanup.format_source_code_changes_only=true @@ -34,15 +34,15 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class= sp_cleanup.qualify_static_member_accesses_with_declaring_class=false sp_cleanup.qualify_static_method_accesses_with_declaring_class=false sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_modifiers=false +sp_cleanup.remove_redundant_modifiers=true sp_cleanup.remove_redundant_type_arguments=true sp_cleanup.remove_trailing_whitespaces=true sp_cleanup.remove_trailing_whitespaces_all=true sp_cleanup.remove_trailing_whitespaces_ignore_empty=false sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unnecessary_nls_tags=true +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=true sp_cleanup.remove_unused_private_fields=true sp_cleanup.remove_unused_private_members=false sp_cleanup.remove_unused_private_methods=true @@ -50,7 +50,7 @@ sp_cleanup.remove_unused_private_types=true sp_cleanup.sort_members=false sp_cleanup.sort_members_all=false sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_blocks=false +sp_cleanup.use_blocks=true sp_cleanup.use_blocks_only_for_return_and_throw=false sp_cleanup.use_lambda=true sp_cleanup.use_parentheses_in_expressions=false diff --git a/org.eclipse.tips.examples/src/org/eclipse/tips/examples/eclipsetips/Tip1.java b/org.eclipse.tips.examples/src/org/eclipse/tips/examples/eclipsetips/Tip1.java index 411fb26d9..c85ce4dea 100644 --- a/org.eclipse.tips.examples/src/org/eclipse/tips/examples/eclipsetips/Tip1.java +++ b/org.eclipse.tips.examples/src/org/eclipse/tips/examples/eclipsetips/Tip1.java @@ -35,7 +35,7 @@ public class Tip1 extends Tip implements IHtmlTip { public String getSubject() { return "This is SwtTipImpl"; } - + @Override public String getHTML() { return "<h1>Iterate with Iterator</h1>" // diff --git a/org.eclipse.tips.ide/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.tips.ide/.settings/org.eclipse.jdt.ui.prefs index 52fe6a983..def5bb091 100644 --- a/org.eclipse.tips.ide/.settings/org.eclipse.jdt.ui.prefs +++ b/org.eclipse.tips.ide/.settings/org.eclipse.jdt.ui.prefs @@ -14,7 +14,7 @@ sp_cleanup.always_use_parentheses_in_expressions=false sp_cleanup.always_use_this_for_non_static_field_access=false sp_cleanup.always_use_this_for_non_static_method_access=false sp_cleanup.convert_functional_interfaces=true -sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.convert_to_enhanced_for_loop=true sp_cleanup.correct_indentation=false sp_cleanup.format_source_code=true sp_cleanup.format_source_code_changes_only=true @@ -34,15 +34,15 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class= sp_cleanup.qualify_static_member_accesses_with_declaring_class=false sp_cleanup.qualify_static_method_accesses_with_declaring_class=false sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_modifiers=false +sp_cleanup.remove_redundant_modifiers=true sp_cleanup.remove_redundant_type_arguments=true sp_cleanup.remove_trailing_whitespaces=true sp_cleanup.remove_trailing_whitespaces_all=true sp_cleanup.remove_trailing_whitespaces_ignore_empty=false sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unnecessary_nls_tags=true +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=true sp_cleanup.remove_unused_private_fields=true sp_cleanup.remove_unused_private_members=false sp_cleanup.remove_unused_private_methods=true @@ -50,7 +50,7 @@ sp_cleanup.remove_unused_private_types=true sp_cleanup.sort_members=false sp_cleanup.sort_members_all=false sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_blocks=false +sp_cleanup.use_blocks=true sp_cleanup.use_blocks_only_for_return_and_throw=false sp_cleanup.use_lambda=true sp_cleanup.use_parentheses_in_expressions=false diff --git a/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/provider/Tip6_ActionsTip.java b/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/provider/Tip6_ActionsTip.java index aa8e07e26..a41cf608c 100644 --- a/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/provider/Tip6_ActionsTip.java +++ b/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/provider/Tip6_ActionsTip.java @@ -57,8 +57,9 @@ public class Tip6_ActionsTip extends Tip implements IHtmlTip { Runnable runner2 = () -> Display.getDefault().syncExec(() -> { PreferenceDialog pref = PreferencesUtil.createPreferenceDialogOn( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), "myPreferencePage", null, null); - if (pref != null) + if (pref != null) { pref.open(); + } }); ArrayList<TipAction> actions = new ArrayList<>(); actions.add(new TipAction("Clock", "What is the time?", clock, getImage("icons/clock.png"))); diff --git a/org.eclipse.tips.json/src/org/eclipse/tips/json/IJsonTip.java b/org.eclipse.tips.json/src/org/eclipse/tips/json/IJsonTip.java index 119c03272..0c045d869 100644 --- a/org.eclipse.tips.json/src/org/eclipse/tips/json/IJsonTip.java +++ b/org.eclipse.tips.json/src/org/eclipse/tips/json/IJsonTip.java @@ -24,5 +24,5 @@ public interface IJsonTip { * * @return the JsonObject describing the tip. */ - public String getJsonObject(); + String getJsonObject(); }
\ No newline at end of file diff --git a/org.eclipse.tips.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.tips.tests/.settings/org.eclipse.jdt.ui.prefs index 52fe6a983..def5bb091 100644 --- a/org.eclipse.tips.tests/.settings/org.eclipse.jdt.ui.prefs +++ b/org.eclipse.tips.tests/.settings/org.eclipse.jdt.ui.prefs @@ -14,7 +14,7 @@ sp_cleanup.always_use_parentheses_in_expressions=false sp_cleanup.always_use_this_for_non_static_field_access=false sp_cleanup.always_use_this_for_non_static_method_access=false sp_cleanup.convert_functional_interfaces=true -sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.convert_to_enhanced_for_loop=true sp_cleanup.correct_indentation=false sp_cleanup.format_source_code=true sp_cleanup.format_source_code_changes_only=true @@ -34,15 +34,15 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class= sp_cleanup.qualify_static_member_accesses_with_declaring_class=false sp_cleanup.qualify_static_method_accesses_with_declaring_class=false sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_modifiers=false +sp_cleanup.remove_redundant_modifiers=true sp_cleanup.remove_redundant_type_arguments=true sp_cleanup.remove_trailing_whitespaces=true sp_cleanup.remove_trailing_whitespaces_all=true sp_cleanup.remove_trailing_whitespaces_ignore_empty=false sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unnecessary_nls_tags=true +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=true sp_cleanup.remove_unused_private_fields=true sp_cleanup.remove_unused_private_members=false sp_cleanup.remove_unused_private_methods=true @@ -50,7 +50,7 @@ sp_cleanup.remove_unused_private_types=true sp_cleanup.sort_members=false sp_cleanup.sort_members_all=false sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_blocks=false +sp_cleanup.use_blocks=true sp_cleanup.use_blocks_only_for_return_and_throw=false sp_cleanup.use_lambda=true sp_cleanup.use_parentheses_in_expressions=false diff --git a/org.eclipse.tips.ui/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.tips.ui/.settings/org.eclipse.jdt.ui.prefs index 52fe6a983..db3cbd40a 100644 --- a/org.eclipse.tips.ui/.settings/org.eclipse.jdt.ui.prefs +++ b/org.eclipse.tips.ui/.settings/org.eclipse.jdt.ui.prefs @@ -14,7 +14,7 @@ sp_cleanup.always_use_parentheses_in_expressions=false sp_cleanup.always_use_this_for_non_static_field_access=false sp_cleanup.always_use_this_for_non_static_method_access=false sp_cleanup.convert_functional_interfaces=true -sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.convert_to_enhanced_for_loop=true sp_cleanup.correct_indentation=false sp_cleanup.format_source_code=true sp_cleanup.format_source_code_changes_only=true @@ -34,14 +34,14 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class= sp_cleanup.qualify_static_member_accesses_with_declaring_class=false sp_cleanup.qualify_static_method_accesses_with_declaring_class=false sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_modifiers=false +sp_cleanup.remove_redundant_modifiers=true sp_cleanup.remove_redundant_type_arguments=true sp_cleanup.remove_trailing_whitespaces=true sp_cleanup.remove_trailing_whitespaces_all=true sp_cleanup.remove_trailing_whitespaces_ignore_empty=false sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unnecessary_nls_tags=true +sp_cleanup.remove_unused_imports=true sp_cleanup.remove_unused_local_variables=false sp_cleanup.remove_unused_private_fields=true sp_cleanup.remove_unused_private_members=false @@ -50,7 +50,7 @@ sp_cleanup.remove_unused_private_types=true sp_cleanup.sort_members=false sp_cleanup.sort_members_all=false sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_blocks=false +sp_cleanup.use_blocks=true sp_cleanup.use_blocks_only_for_return_and_throw=false sp_cleanup.use_lambda=true sp_cleanup.use_parentheses_in_expressions=false diff --git a/org.eclipse.tips.ui/src/org/eclipse/tips/ui/ISwtTip.java b/org.eclipse.tips.ui/src/org/eclipse/tips/ui/ISwtTip.java index 46424fc4c..08a25ad6d 100644 --- a/org.eclipse.tips.ui/src/org/eclipse/tips/ui/ISwtTip.java +++ b/org.eclipse.tips.ui/src/org/eclipse/tips/ui/ISwtTip.java @@ -28,5 +28,5 @@ public interface ISwtTip { * @param parent * the parent composite */ - public abstract void createControl(Composite parent); + void createControl(Composite parent); }
\ No newline at end of file diff --git a/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/ProviderSelectionListener.java b/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/ProviderSelectionListener.java index 4e0d58e92..85e027684 100644 --- a/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/ProviderSelectionListener.java +++ b/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/ProviderSelectionListener.java @@ -25,5 +25,5 @@ public interface ProviderSelectionListener { * @param provider * the {@link TipProvider} that was selected */ - public void selected(TipProvider provider); + void selected(TipProvider provider); }
\ No newline at end of file diff --git a/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/Slider.java b/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/Slider.java index e377730c9..d6b605eb5 100644 --- a/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/Slider.java +++ b/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/Slider.java @@ -145,8 +145,9 @@ public class Slider extends Composite { private void setupProviderListener() { fPropertyChangeListener = provider -> { - if (!isDisposed()) + if (!isDisposed()) { getDisplay().asyncExec(() -> load()); + } }; } |