You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2017/08/29 02:53:44 UTC
svn commit: r1806523 - in
/directory/studio/branches/studio-value/plugins/ldapservers: ./
src/main/java/org/apache/directory/studio/ldapservers/
src/main/java/org/apache/directory/studio/ldapservers/actions/
Author: elecharny
Date: Tue Aug 29 02:53:44 2017
New Revision: 1806523
URL: http://svn.apache.org/viewvc?rev=1806523&view=rev
Log:
o Get rid of Plugin_id in plugin.properties
o Removed the various ID defined in plugin.properties that are used only once
o Simplified a function
Modified:
directory/studio/branches/studio-value/plugins/ldapservers/plugin.properties
directory/studio/branches/studio-value/plugins/ldapservers/plugin.xml
directory/studio/branches/studio-value/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersPluginConstants.java
directory/studio/branches/studio-value/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/CreateConnectionActionHelper.java
Modified: directory/studio/branches/studio-value/plugins/ldapservers/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/ldapservers/plugin.properties?rev=1806523&r1=1806522&r2=1806523&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/ldapservers/plugin.properties (original)
+++ directory/studio/branches/studio-value/plugins/ldapservers/plugin.properties Tue Aug 29 02:53:44 2017
@@ -14,59 +14,51 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#---------------------------------------------------------------------------------------------------
+# The IDs used more than once
+#---------------------------------------------------------------------------------------------------
+View_Category_id=org.apache.directory.studio.ldapservers.category
-Plugin_id=org.apache.directory.studio.ldapservers
+Cmd_Category_id=org.apache.directory.studio.ldapservers.commands
+Cmd_NewServer_id=org.apache.directory.studio.ldapservers.commands.newServer
+Cmd_Delete_id=org.apache.directory.studio.ldapservers.commands.delete
+Cmd_Rename_id=org.apache.directory.studio.ldapservers.commands.rename
+Cmd_Start_id=org.apache.directory.studio.ldapservers.commands.start
+Cmd_Stop_id=org.apache.directory.studio.ldapservers.commands.stop
+Cmd_Properties_id=org.apache.directory.studio.ldapservers.commands.properties
+Cmd_OpenConfiguration_id=org.apache.directory.studio.ldapservers.commands.openConfiguration
+Ctx_ServersView_id=org.apache.directory.studio.ldapservers.contexts.serversView=
-View_Category_id=org.apache.directory.studio.ldapservers.category
+#---------------------------------------------------------------------------------------------------
+# The I18n Strings
+#---------------------------------------------------------------------------------------------------
View_Category_name=LDAP Servers
-
-View_ServersView_id=org.apache.directory.studio.apacheds.serversView
View_ServersView_name=Servers
-Prop_ServerPropertyPage_id=org.apache.directory.studio.apacheds.properties.serverProperties
Prop_ServerPropertyPage_name=Info
-Cmd_Category_id=org.apache.directory.studio.ldapservers.commands
Cmd_Category_name=LDAP Servers
-Cmd_NewServer_id=org.apache.directory.studio.ldapservers.commands.newServer
Cmd_NewServer_name=New Server
Cmd_NewServer_description=Creates a new server
-Cmd_Delete_id=org.apache.directory.studio.ldapservers.commands.delete
Cmd_Delete_name=Delete
Cmd_Delete_description=Deletes a server
-Cmd_Rename_id=org.apache.directory.studio.ldapservers.commands.rename
Cmd_Rename_name=Rename
Cmd_Rename_description=Renames the server
-Cmd_Start_id=org.apache.directory.studio.ldapservers.commands.start
Cmd_Start_name=Start
Cmd_Start_description=Starts the server
-Cmd_Stop_id=org.apache.directory.studio.ldapservers.commands.stop
Cmd_Stop_name=Stop
Cmd_Stop_description=Stops the server
-Cmd_Properties_id=org.apache.directory.studio.ldapservers.commands.properties
Cmd_Properties_name=Properties
Cmd_Properties_description=Shows the properties of the server
-Cmd_OpenConfiguration_id=org.apache.directory.studio.ldapservers.commands.openConfiguration
Cmd_OpenConfiguration_name=Open Configuration
Cmd_OpenConfiguration_description=Open Configuration
-Ctx_ServersView_id=org.apache.directory.studio.ldapservers.contexts.serversView
Ctx_ServersView_name=In LDAP Servers View
Ctx_ServersView_description=In LDAP Servers View
-
-Plugin_ConnectionCore_id=org.apache.directory.studio.connection.core
-Plugin_ConnectionUi_id=org.apache.directory.studio.connection.ui
-Plugin_LdapBrowserCommon_id=org.apache.directory.studio.ldapbrowser.common
-Plugin_LdapBrowserCore_id=org.apache.directory.studio.ldapbrowser.core
-Plugin_LdapBrowserUi_id=org.apache.directory.studio.ldapbrowser.ui
-Plugin_LdifEditor_id=org.apache.directory.studio.ldifeditor
-Plugin_LdifParser_id=org.apache.directory.studio.ldifparser
-
-Perspective_LdapBrowserPerspective_id=org.apache.directory.studio.ldapbrowser.ui.perspective.BrowserPerspective
Modified: directory/studio/branches/studio-value/plugins/ldapservers/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/ldapservers/plugin.xml?rev=1806523&r1=1806522&r2=1806523&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/ldapservers/plugin.xml (original)
+++ directory/studio/branches/studio-value/plugins/ldapservers/plugin.xml Tue Aug 29 02:53:44 2017
@@ -19,160 +19,170 @@
-->
<?eclipse version="3.2"?>
<plugin>
- <extension-point id="ldapServerAdapters" name="LDAP Server Adapters" schema="resources/ldapServerAdapters.exsd"/>
-
- <extension
- point="org.eclipse.ui.views">
- <category
- id="org.apache.directory.studio.ldapservers.view.category"
- name="LDAP Servers" />
+ <extension-point id="ldapServerAdapters" name="LDAP Server Adapters" schema="resources/ldapServerAdapters.exsd"/>
+
+ <extension
+ point="org.eclipse.ui.views">
+ <category
+ id="org.apache.directory.studio.ldapservers.view.category"
+ name="LDAP Servers" />
+ <view
+ category="org.apache.directory.studio.ldapservers.view.category"
+ class="org.apache.directory.studio.ldapservers.views.ServersView"
+ icon="resources/icons/servers_view.gif"
+ id="org.apache.directory.studio.ldapservers.views.ServersView"
+ name="LDAP Servers"/>
+ </extension>
+
+ <extension
+ point="org.eclipse.ui.perspectiveExtensions">
+ <perspectiveExtension
+ targetID="org.apache.directory.studio.ldapbrowser.ui.perspective.BrowserPerspective">
<view
- category="org.apache.directory.studio.ldapservers.view.category"
- class="org.apache.directory.studio.ldapservers.views.ServersView"
- icon="resources/icons/servers_view.gif"
- id="org.apache.directory.studio.ldapservers.views.ServersView"
- name="LDAP Servers"/>
- </extension>
-
- <extension
- point="org.eclipse.ui.perspectiveExtensions">
- <perspectiveExtension
- targetID="org.apache.directory.studio.ldapbrowser.ui.perspective.BrowserPerspective">
- <view
- closeable="true"
- id="org.apache.directory.studio.ldapservers.views.ServersView"
- minimized="false"
- moveable="true"
- relationship="stack"
- relative="org.apache.directory.studio.ldapbrowser.ui.views.connection.ConnectionView"
- showTitle="true"
- visible="true">
- </view>
- </perspectiveExtension>
- </extension>
-
- <extension
- point="org.eclipse.ui.propertyPages">
- <page
- class="org.apache.directory.studio.ldapservers.properties.ServerPropertyPage"
- id="org.apache.directory.studio.ldapservers.properties.ServerPropertyPage"
- name="Info">
- <enabledWhen>
- <instanceof
- value="org.apache.directory.studio.ldapservers.model.LdapServer">
- </instanceof>
- </enabledWhen>
- </page>
- <page
- class="org.apache.directory.studio.ldapservers.properties.ServerPropertyConfigurationPage"
- id="org.apache.directory.studio.ldapservers.properties.ServerPropertyConfigurationPage"
- category="org.apache.directory.studio.ldapservers.properties.ServerPropertyPage"
- name="Configuration">
- <enabledWhen>
- <instanceof
- value="org.apache.directory.studio.ldapservers.model.LdapServer">
- </instanceof>
- </enabledWhen>
- <filter name="hasConfigurationPage" value="true"/>
- </page>
- </extension>
-
- <extension
- point="org.eclipse.ui.commands">
- <category
- id="%Cmd_Category_id"
- name="%Cmd_Category_name">
- </category>
- <command
- categoryId="%Cmd_Category_id"
- description="%Cmd_NewServer_description"
- id="%Cmd_NewServer_id"
- name="%Cmd_NewServer_name">
- </command>
- <command
- categoryId="%Cmd_Category_id"
- description="%Cmd_Delete_description"
- id="%Cmd_Delete_id"
- name="%Cmd_Delete_name">
- </command>
- <command
- categoryId="%Cmd_Category_id"
- description="%Cmd_Rename_description"
- id="%Cmd_Rename_id"
- name="%Cmd_Rename_name">
- </command>
- <command
- categoryId="%Cmd_Category_id"
- description="%Cmd_Start_description"
- id="%Cmd_Start_id"
- name="%Cmd_Start_name">
- </command>
- <command
- categoryId="%Cmd_Category_id"
- description="%Cmd_Stop_description"
- id="%Cmd_Stop_id"
- name="%Cmd_Stop_name">
- </command>
- <command
- categoryId="%Cmd_Category_id"
- description="%Cmd_Properties_description"
- id="%Cmd_Properties_id"
- name="%Cmd_Properties_name">
- </command>
- <command
- categoryId="%Cmd_Category_id"
- description="%Cmd_OpenConfiguration_description"
- id="%Cmd_OpenConfiguration_id"
- name="%Cmd_OpenConfiguration_name">
- </command>
- </extension>
-
- <extension
- point="org.eclipse.ui.contexts">
- <context
- description="%Ctx_ServersView_description"
- id="%Ctx_ServersView_id"
- name="%Ctx_ServersView_name"
- parentId="org.eclipse.ui.contexts.window">
- </context>
- </extension>
-
- <extension
- point="org.eclipse.ui.bindings">
- <key
- commandId="%Cmd_NewServer_id"
- contextId="%Ctx_ServersView_id"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="M1+E"/>
- <key
- commandId="%Cmd_Delete_id"
- contextId="%Ctx_ServersView_id"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="DEL"/>
- <key
- commandId="%Cmd_Rename_id"
- contextId="%Ctx_ServersView_id"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="F2"/>
- <key
- commandId="%Cmd_Start_id"
- contextId="%Ctx_ServersView_id"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="M1+R"/>
- <key
- commandId="%Cmd_Stop_id"
- contextId="%Ctx_ServersView_id"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="M1+T"/>
- <key
- commandId="%Cmd_Properties_id"
- contextId="%Ctx_ServersView_id"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="ALT+RETURN"/>
- <key
- commandId="%Cmd_OpenConfiguration_id"
- contextId="%Ctx_ServersView_id"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="F3"/>
- </extension>
+ closeable="true"
+ id="org.apache.directory.studio.ldapservers.views.ServersView"
+ minimized="false"
+ moveable="true"
+ relationship="stack"
+ relative="org.apache.directory.studio.ldapbrowser.ui.views.connection.ConnectionView"
+ showTitle="true"
+ visible="true">
+ </view>
+ </perspectiveExtension>
+ </extension>
+
+ <extension
+ point="org.eclipse.ui.propertyPages">
+ <page
+ class="org.apache.directory.studio.ldapservers.properties.ServerPropertyPage"
+ id="org.apache.directory.studio.ldapservers.properties.ServerPropertyPage"
+ name="Info">
+ <enabledWhen>
+ <instanceof value="org.apache.directory.studio.ldapservers.model.LdapServer"/>
+ </enabledWhen>
+ </page>
+
+ <page
+ class="org.apache.directory.studio.ldapservers.properties.ServerPropertyConfigurationPage"
+ id="org.apache.directory.studio.ldapservers.properties.ServerPropertyConfigurationPage"
+ category="org.apache.directory.studio.ldapservers.properties.ServerPropertyPage"
+ name="Configuration">
+ <enabledWhen>
+ <instanceof value="org.apache.directory.studio.ldapservers.model.LdapServer"/>
+ </enabledWhen>
+ <filter name="hasConfigurationPage" value="true"/>
+ </page>
+ </extension>
+
+ <extension
+ point="org.eclipse.ui.commands">
+ <category
+ id="%Cmd_Category_id"
+ name="%Cmd_Category_name">
+ </category>
+
+ <command
+ categoryId="%Cmd_Category_id"
+ description="%Cmd_NewServer_description"
+ id="%Cmd_NewServer_id"
+ name="%Cmd_NewServer_name">
+ </command>
+
+ <command
+ categoryId="%Cmd_Category_id"
+ description="%Cmd_Delete_description"
+ id="%Cmd_Delete_id"
+ name="%Cmd_Delete_name">
+ </command>
+
+ <command
+ categoryId="%Cmd_Category_id"
+ description="%Cmd_Rename_description"
+ id="%Cmd_Rename_id"
+ name="%Cmd_Rename_name">
+ </command>
+
+ <command
+ categoryId="%Cmd_Category_id"
+ description="%Cmd_Start_description"
+ id="%Cmd_Start_id"
+ name="%Cmd_Start_name">
+ </command>
+
+ <command
+ categoryId="%Cmd_Category_id"
+ description="%Cmd_Stop_description"
+ id="%Cmd_Stop_id"
+ name="%Cmd_Stop_name">
+ </command>
+
+ <command
+ categoryId="%Cmd_Category_id"
+ description="%Cmd_Properties_description"
+ id="%Cmd_Properties_id"
+ name="%Cmd_Properties_name">
+ </command>
+
+ <command
+ categoryId="%Cmd_Category_id"
+ description="%Cmd_OpenConfiguration_description"
+ id="%Cmd_OpenConfiguration_id"
+ name="%Cmd_OpenConfiguration_name">
+ </command>
+ </extension>
+
+ <extension
+ point="org.eclipse.ui.contexts">
+ <context
+ description="%Ctx_ServersView_description"
+ id="%Ctx_ServersView_id"
+ name="%Ctx_ServersView_name"
+ parentId="org.eclipse.ui.contexts.window">
+ </context>
+ </extension>
+
+ <extension
+ point="org.eclipse.ui.bindings">
+ <key
+ commandId="%Cmd_NewServer_id"
+ contextId="%Ctx_ServersView_id"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M1+E"/>
+
+ <key
+ commandId="%Cmd_Delete_id"
+ contextId="%Ctx_ServersView_id"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="DEL"/>
+
+ <key
+ commandId="%Cmd_Rename_id"
+ contextId="%Ctx_ServersView_id"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="F2"/>
+
+ <key
+ commandId="%Cmd_Start_id"
+ contextId="%Ctx_ServersView_id"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M1+R"/>
+
+ <key
+ commandId="%Cmd_Stop_id"
+ contextId="%Ctx_ServersView_id"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M1+T"/>
+
+ <key
+ commandId="%Cmd_Properties_id"
+ contextId="%Ctx_ServersView_id"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="ALT+RETURN"/>
+
+ <key
+ commandId="%Cmd_OpenConfiguration_id"
+ contextId="%Ctx_ServersView_id"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="F3"/>
+ </extension>
</plugin>
Modified: directory/studio/branches/studio-value/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersPluginConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersPluginConstants.java?rev=1806523&r1=1806522&r2=1806523&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersPluginConstants.java (original)
+++ directory/studio/branches/studio-value/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersPluginConstants.java Tue Aug 29 02:53:44 2017
@@ -39,7 +39,7 @@ public final class LdapServersPluginCons
}
/** The plug-in ID */
- public static final String PLUGIN_ID = LdapServersPlugin.getDefault().getPluginProperties().getString( "Plugin_id" ); //$NON-NLS-1$
+ public static final String PLUGIN_ID = LdapServersPluginConstants.class.getPackage().getName();
/** The LDAP Adapters Extension Point ID */
public static final String LDAP_SERVER_ADAPTERS_EXTENSION_POINT = PLUGIN_ID + ".ldapServerAdapters"; //$NON-NLS-1$
@@ -88,8 +88,7 @@ public final class LdapServersPluginCons
// -----
// VIEWS
// -----
- public static final String VIEW_SERVERS_VIEW = LdapServersPlugin.getDefault().getPluginProperties()
- .getString( "View_ServersView_id" ); //$NON-NLS-1$
+ public static final String VIEW_SERVERS_VIEW = "org.apache.directory.studio.apacheds.serversView"; //$NON-NLS-1$
// --------
// CONTEXTS
Modified: directory/studio/branches/studio-value/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/CreateConnectionActionHelper.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/CreateConnectionActionHelper.java?rev=1806523&r1=1806522&r2=1806523&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/CreateConnectionActionHelper.java (original)
+++ directory/studio/branches/studio-value/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/CreateConnectionActionHelper.java Tue Aug 29 02:53:44 2017
@@ -20,11 +20,8 @@
package org.apache.directory.studio.ldapservers.actions;
-import java.util.PropertyResourceBundle;
-
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
-import org.apache.directory.studio.ldapservers.LdapServersPlugin;
import org.apache.directory.studio.ldapservers.model.LdapServer;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.dialogs.IDialogConstants;
@@ -102,8 +99,7 @@ public class CreateConnectionActionHelpe
{
for ( IPerspectiveDescriptor perspective : PlatformUI.getWorkbench().getPerspectiveRegistry().getPerspectives() )
{
- if ( LdapServersPlugin.getDefault().getPluginProperties()
- .getString( "Perspective_LdapBrowserPerspective_id" ) //$NON-NLS-1$
+ if ( "org.apache.directory.studio.ldapbrowser.ui.perspective.BrowserPerspective" //$NON-NLS-1$
.equalsIgnoreCase( perspective.getId() ) )
{
return perspective;
@@ -123,92 +119,27 @@ public class CreateConnectionActionHelpe
*/
public static boolean isLdapBrowserPluginsAvailable()
{
- PropertyResourceBundle properties = LdapServersPlugin.getDefault().getPluginProperties();
-
- // Connection Core Plugin
- Bundle connectionCoreBundle = Platform.getBundle( properties.getString( "Plugin_ConnectionCore_id" ) ); //$NON-NLS-1$
- if ( connectionCoreBundle != null )
+ String[] bundleNames = new String[]
+ {
+ "org.apache.directory.studio.connection.core", // Connection Core Plugin
+ "org.apache.directory.studio.connection.ui", // Connection UI Plugin
+ "org.apache.directory.studio.ldapbrowser.common", // LDAP Browser Common Plugin
+ "org.apache.directory.studio.ldapbrowser.core", // LDAP Browser Core Plugin
+ "org.apache.directory.studio.ldapbrowser.ui", // LDAP Browser UI Plugin
+ "org.apache.directory.studio.ldifeditor", // LDIF Editor Plugin
+ "org.apache.directory.studio.ldifparser" // LDIF Parser Plugin
+ };
+
+ for ( String bundleName : bundleNames )
{
- // Checking the state of the plugin
- if ( connectionCoreBundle.getState() == Bundle.UNINSTALLED )
+ Bundle bundle = Platform.getBundle( bundleName );
+
+ if ( ( bundle == null ) || ( bundle.getState() == Bundle.UNINSTALLED ) )
{
return false;
}
-
- // Connection UI Plugin
- Bundle connectionUiBundle = Platform.getBundle( properties.getString( "Plugin_ConnectionUi_id" ) ); //$NON-NLS-1$
- if ( connectionUiBundle != null )
- {
- // Checking the state of the plugin
- if ( connectionUiBundle.getState() == Bundle.UNINSTALLED )
- {
- return false;
- }
-
- // LDAP Browser Common Plugin
- Bundle ldapBrowserCommonBundle = Platform.getBundle( properties
- .getString( "Plugin_LdapBrowserCommon_id" ) ); //$NON-NLS-1$
- if ( ldapBrowserCommonBundle != null )
- {
- // Checking the state of the plugin
- if ( ldapBrowserCommonBundle.getState() == Bundle.UNINSTALLED )
- {
- return false;
- }
-
- // LDAP Browser Core Plugin
- Bundle ldapBrowserCoreBundle = Platform.getBundle( properties
- .getString( "Plugin_LdapBrowserCore_id" ) ); //$NON-NLS-1$
- if ( ldapBrowserCoreBundle != null )
- {
- // Checking the state of the plugin
- if ( ldapBrowserCoreBundle.getState() == Bundle.UNINSTALLED )
- {
- return false;
- }
-
- // LDAP Browser UI Plugin
- Bundle ldapBrowserUiBundle = Platform.getBundle( properties
- .getString( "Plugin_LdapBrowserUi_id" ) ); //$NON-NLS-1$
- if ( ldapBrowserUiBundle != null )
- {
- // Checking the state of the plugin
- if ( ldapBrowserUiBundle.getState() == Bundle.UNINSTALLED )
- {
- return false;
- }
-
- // LDIF Editor Plugin
- Bundle ldifEditorBundle = Platform
- .getBundle( properties.getString( "Plugin_LdifEditor_id" ) ); //$NON-NLS-1$
- if ( ldifEditorBundle != null )
- {
- // Checking the state of the plugin
- if ( ldifEditorBundle.getState() == Bundle.UNINSTALLED )
- {
- return false;
- }
-
- // LDIF Parser Plugin
- Bundle ldifParserBundle = Platform.getBundle( properties
- .getString( "Plugin_LdifParser_id" ) ); //$NON-NLS-1$
- if ( ldifParserBundle != null )
- {
- // Checking the state of the plugin
- if ( ldifParserBundle.getState() == Bundle.UNINSTALLED )
- {
- return false;
- }
-
- return true;
- }
- }
- }
- }
- }
- }
}
-
- return false;
+
+ return true;
}
}