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/28 07:22:37 UTC
svn commit: r1806406 - in
/directory/studio/branches/studio-value/plugins/connection.ui: ./
src/main/java/org/apache/directory/studio/connection/ui/
src/main/java/org/apache/directory/studio/connection/ui/widgets/
Author: elecharny
Date: Mon Aug 28 07:22:37 2017
New Revision: 1806406
URL: http://svn.apache.org/viewvc?rev=1806406&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
Modified:
directory/studio/branches/studio-value/plugins/connection.ui/plugin.properties
directory/studio/branches/studio-value/plugins/connection.ui/plugin.xml
directory/studio/branches/studio-value/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionParameterPageManager.java
directory/studio/branches/studio-value/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java
directory/studio/branches/studio-value/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java
Modified: directory/studio/branches/studio-value/plugins/connection.ui/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/connection.ui/plugin.properties?rev=1806406&r1=1806405&r2=1806406&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/connection.ui/plugin.properties (original)
+++ directory/studio/branches/studio-value/plugins/connection.ui/plugin.properties Mon Aug 28 07:22:37 2017
@@ -14,39 +14,33 @@
# 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
+#---------------------------------------------------------------------------------------------------
+Prop_ConnectionPropertyPage_id=org.apache.directory.studio.connection.ui.properties.ConnectionPropertyPage
+
+NewWizards_NewConnectionWizard_id=org.apache.directory.studio.connection.ui.wizards.NewConnectionWizard
+
+ConnectionParameterPage_NetworkParameterPage_id=org.apache.directory.studio.connection.ui.widgets.NetworkParameterPage
-Plugin_id=org.apache.directory.studio.connection.ui
+PrefPage_ConnectionsPreferencePage_id=org.apache.directory.studio.connection.preferences.ConnectionsPreferencePage
+PrefPage_CertificateValidationPreferencePage_id=org.apache.directory.studio.connection.preferences.CertificateValidationPreferencePage
-ExtensionPoint_ConnectionParameterPages_id=org.apache.directory.studio.connectionparameterpages
+#---------------------------------------------------------------------------------------------------
+# The I18n Strings
+#---------------------------------------------------------------------------------------------------
ExtensionPoint_ConnectionParameterPages_name=Connection Parameter Pages
-Prop_ConnectionPropertyPage_id=org.apache.directory.studio.connection.ui.properties.ConnectionPropertyPage
Prop_ConnectionPropertyPage_name=Connection
-NewWizards_Category_id=org.apache.directory.studio.ldapbrowser.newWizards
-
-NewWizards_NewConnectionWizard_id=org.apache.directory.studio.connection.ui.wizards.NewConnectionWizard
NewWizards_NewConnectionWizard_name=LDAP Connection
-ConnectionParameterPage_NetworkParameterPage_id=org.apache.directory.studio.connection.ui.widgets.NetworkParameterPage
ConnectionParameterPage_NetworkParameterPage_name=Network Parameter
ConnectionParameterPage_NetworkParameterPage_description=Please enter connection name and network parameters.
-ConnectionParameterPage_AuthenticationParameterPage_id=org.apache.directory.studio.connection.ui.widgets.AuthenticationParameterPage
ConnectionParameterPage_AuthenticationParameterPage_name=Authentication
ConnectionParameterPage_AuthenticationParameterPage_description=Please select an authentication method and input authentication data.
-ConnectionTransfert_Typename=org.apache.directory.studio.ldapbrowser.connection
-
-Cmd_Copy_id=org.apache.directory.studio.ldapbrowser.action.copy
-Cmd_Paste_id=org.apache.directory.studio.ldapbrowser.action.paste
-Cmd_Delete_id=org.apache.directory.studio.ldapbrowser.action.delete
-Cmd_Properties_id=org.apache.directory.studio.ldapbrowser.action.properties
-
-PrefPage_StudioPage_id=org.apache.directory.studio.StudioPreferencePage
-PrefPage_ConnectionsPreferencePage_id=org.apache.directory.studio.connection.preferences.ConnectionsPreferencePage
PrefPage_ConnectionsPreferencePage_name=Connections
-PrefPage_CertificateValidationPreferencePage_id=org.apache.directory.studio.connection.preferences.CertificateValidationPreferencePage
PrefPage_CertificateValidationPreferencePage_name=Certificate Validation
-PrefPage_PasswordsKeystorePreferencePage_id=org.apache.directory.studio.connection.ui.preferences.PasswordsKeystorePreferencePage
PrefPage_PasswordsKeystorePreferencePage_name=Passwords Keystore
Modified: directory/studio/branches/studio-value/plugins/connection.ui/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/connection.ui/plugin.xml?rev=1806406&r1=1806405&r2=1806406&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/connection.ui/plugin.xml (original)
+++ directory/studio/branches/studio-value/plugins/connection.ui/plugin.xml Mon Aug 28 07:22:37 2017
@@ -19,65 +19,64 @@
under the License.
-->
<plugin>
- <extension-point id="org.apache.directory.studio.connectionparameterpages" name="%ExtensionPoint_ConnectionParameterPages_name" schema="src/main/resources/connectionParameterPages.exsd"/>
+ <extension-point id="org.apache.directory.studio.connectionparameterpages" name="%ExtensionPoint_ConnectionParameterPages_name" schema="src/main/resources/connectionParameterPages.exsd"/>
- <extension
- point="org.eclipse.ui.propertyPages">
- <page
+ <extension
+ point="org.eclipse.ui.propertyPages">
+ <page
class="org.apache.directory.studio.connection.ui.properties.ConnectionPropertyPage"
id="%Prop_ConnectionPropertyPage_id"
name="%Prop_ConnectionPropertyPage_name"
- objectClass="org.apache.directory.studio.connection.core.ConnectionPropertyPageProvider"/>
+ objectClass="org.apache.directory.studio.connection.core.ConnectionPropertyPageProvider"/>
+ </extension>
- </extension>
-
- <extension
- point="org.eclipse.ui.newWizards">
- <wizard
- category="%NewWizards_Category_id"
- class="org.apache.directory.studio.connection.ui.wizards.NewConnectionWizard"
- hasPages="true"
- icon="resources/icons/connection_add.gif"
- id="%NewWizards_NewConnectionWizard_id"
- name="%NewWizards_NewConnectionWizard_name"
- project="false"/>
- </extension>
+ <extension
+ point="org.eclipse.ui.newWizards">
+ <wizard
+ category="org.apache.directory.studio.ldapbrowser.newWizards"
+ class="org.apache.directory.studio.connection.ui.wizards.NewConnectionWizard"
+ hasPages="true"
+ icon="resources/icons/connection_add.gif"
+ id="%NewWizards_NewConnectionWizard_id"
+ name="%NewWizards_NewConnectionWizard_name"
+ project="false"/>
+ </extension>
- <extension
- point="org.apache.directory.studio.connectionparameterpages">
- <connectionParameterPage
- class="org.apache.directory.studio.connection.ui.widgets.NetworkParameterPage"
- dependsOnId="%ConnectionParameterPage_NetworkParameterPage_id"
- description="%ConnectionParameterPage_NetworkParameterPage_description"
- id="%ConnectionParameterPage_NetworkParameterPage_id"
- name="%ConnectionParameterPage_NetworkParameterPage_name"/>
- <connectionParameterPage
- class="org.apache.directory.studio.connection.ui.widgets.AuthenticationParameterPage"
- dependsOnId="%ConnectionParameterPage_NetworkParameterPage_id"
- description="%ConnectionParameterPage_AuthenticationParameterPage_description"
- id="%ConnectionParameterPage_AuthenticationParameterPage_id"
- name="%ConnectionParameterPage_AuthenticationParameterPage_name"/>
+ <extension
+ point="org.apache.directory.studio.connectionparameterpages">
+ <connectionParameterPage
+ class="org.apache.directory.studio.connection.ui.widgets.NetworkParameterPage"
+ dependsOnId="%ConnectionParameterPage_NetworkParameterPage_id"
+ description="%ConnectionParameterPage_NetworkParameterPage_description"
+ id="%ConnectionParameterPage_NetworkParameterPage_id"
+ name="%ConnectionParameterPage_NetworkParameterPage_name"/>
+
+ <connectionParameterPage
+ class="org.apache.directory.studio.connection.ui.widgets.AuthenticationParameterPage"
+ dependsOnId="%ConnectionParameterPage_NetworkParameterPage_id"
+ description="%ConnectionParameterPage_AuthenticationParameterPage_description"
+ id="org.apache.directory.studio.connection.ui.widgets.AuthenticationParameterPage"
+ name="%ConnectionParameterPage_AuthenticationParameterPage_name"/>
</extension>
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- category="%PrefPage_StudioPage_id"
- class="org.apache.directory.studio.connection.ui.preferences.ConnectionsPreferencePage"
- id="%PrefPage_ConnectionsPreferencePage_id"
- name="%PrefPage_ConnectionsPreferencePage_name">
- </page>
- <page
- category="%PrefPage_ConnectionsPreferencePage_id"
- class="org.apache.directory.studio.connection.ui.preferences.CertificateValidationPreferencePage"
- id="%PrefPage_CertificateValidationPreferencePage_id"
- name="%PrefPage_CertificateValidationPreferencePage_name">
- </page>
- <page
- category="%PrefPage_ConnectionsPreferencePage_id"
- class="org.apache.directory.studio.connection.ui.preferences.PasswordsKeystorePreferencePage"
- id="%PrefPage_PasswordsKeystorePreferencePage_id"
- name="%PrefPage_PasswordsKeystorePreferencePage_name">
- </page>
- </extension>
+ <extension
+ point="org.eclipse.ui.preferencePages">
+ <page
+ category="org.apache.directory.studio.StudioPreferencePage"
+ class="org.apache.directory.studio.connection.ui.preferences.ConnectionsPreferencePage"
+ id="%PrefPage_ConnectionsPreferencePage_id"
+ name="%PrefPage_ConnectionsPreferencePage_name"/>
+
+ <page
+ category="%PrefPage_ConnectionsPreferencePage_id"
+ class="org.apache.directory.studio.connection.ui.preferences.CertificateValidationPreferencePage"
+ id="%PrefPage_CertificateValidationPreferencePage_id"
+ name="%PrefPage_CertificateValidationPreferencePage_name"/>
+
+ <page
+ category="%PrefPage_ConnectionsPreferencePage_id"
+ class="org.apache.directory.studio.connection.ui.preferences.PasswordsKeystorePreferencePage"
+ id="org.apache.directory.studio.connection.ui.preferences.PasswordsKeystorePreferencePage"
+ name="%PrefPage_PasswordsKeystorePreferencePage_name"/>
+ </extension>
</plugin>
Modified: directory/studio/branches/studio-value/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionParameterPageManager.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionParameterPageManager.java?rev=1806406&r1=1806405&r2=1806406&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionParameterPageManager.java (original)
+++ directory/studio/branches/studio-value/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionParameterPageManager.java Mon Aug 28 07:22:37 2017
@@ -58,8 +58,7 @@ public final class ConnectionParameterPa
public static ConnectionParameterPage[] getConnectionParameterPages()
{
IExtensionRegistry registry = Platform.getExtensionRegistry();
- IExtensionPoint extensionPoint = registry.getExtensionPoint( ConnectionUIPlugin.getDefault()
- .getPluginProperties().getString( "ExtensionPoint_ConnectionParameterPages_id" ) ); //$NON-NLS-1$
+ IExtensionPoint extensionPoint = registry.getExtensionPoint( "org.apache.directory.studio.connectionparameterpages" ); //$NON-NLS-1$
IConfigurationElement[] members = extensionPoint.getConfigurationElements();
final Map<String, ConnectionParameterPage> pageMap = new ConcurrentHashMap<>();
Modified: directory/studio/branches/studio-value/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java?rev=1806406&r1=1806405&r2=1806406&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java (original)
+++ directory/studio/branches/studio-value/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java Mon Aug 28 07:22:37 2017
@@ -30,8 +30,7 @@ package org.apache.directory.studio.conn
public final class ConnectionUIConstants
{
/** The plug-in ID */
- public static final String PLUGIN_ID = ConnectionUIPlugin.getDefault().getPluginProperties()
- .getString( "Plugin_id" ); //$NON-NLS-1$
+ public static final String PLUGIN_ID = ConnectionUIConstants.class.getPackage().getName();
/** The dialog setting key used for the history of host names. */
public static final String DIALOGSETTING_KEY_HOST_HISTORY = "hostHistory"; //$NON-NLS-1$
@@ -88,24 +87,19 @@ public final class ConnectionUIConstants
public static final String IMG_CERTIFICATE_EXPORT_WIZARD = "resources/icons/certificate_export_wizard.gif"; //$NON-NLS-1$
/** The connection transfer typename */
- public static final String TYPENAME = ConnectionUIPlugin.getDefault().getPluginProperties()
- .getString( "ConnectionTransfert_Typename" ); //$NON-NLS-1$
+ public static final String TYPENAME = "org.apache.directory.studio.ldapbrowser.connection"; //$NON-NLS-1$
/** The COPY command */
- public static final String CMD_COPY = ConnectionUIPlugin.getDefault().getPluginProperties()
- .getString( "Cmd_Copy_id" ); //$NON-NLS-1$
+ public static final String CMD_COPY = "org.apache.directory.studio.ldapbrowser.action.copy"; //$NON-NLS-1$
/** The PASTE command */
- public static final String CMD_PASTE = ConnectionUIPlugin.getDefault().getPluginProperties()
- .getString( "Cmd_Paste_id" ); //$NON-NLS-1$
+ public static final String CMD_PASTE = "org.apache.directory.studio.ldapbrowser.action.paste"; //$NON-NLS-1$
/** The DELETE command */
- public static final String CMD_DELETE = ConnectionUIPlugin.getDefault().getPluginProperties()
- .getString( "Cmd_Delete_id" ); //$NON-NLS-1$
+ public static final String CMD_DELETE = "org.apache.directory.studio.ldapbrowser.action.delete"; //$NON-NLS-1$
/** The PROPERTIES command */
- public static final String CMD_PROPERTIES = ConnectionUIPlugin.getDefault().getPluginProperties()
- .getString( "Cmd_Properties_id" ); //$NON-NLS-1$
+ public static final String CMD_PROPERTIES = "org.apache.directory.studio.ldapbrowser.action.properties"; //$NON-NLS-1$
/** The new wizard/new connection connection */
public static final String NEW_WIZARD_NEW_CONNECTION = ConnectionUIPlugin.getDefault().getPluginProperties()
Modified: directory/studio/branches/studio-value/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java?rev=1806406&r1=1806405&r2=1806406&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java (original)
+++ directory/studio/branches/studio-value/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java Mon Aug 28 07:22:37 2017
@@ -144,7 +144,8 @@ public class NetworkParameterPage extend
@Override
public void widgetSelected( SelectionEvent event )
{
- String certificateValidationPreferencePageId = "org.apache.directory.studio.connection.preferences.CertificateValidationPreferencePage"; //$NON-NLS-1$
+ String certificateValidationPreferencePageId = ConnectionUIPlugin.getDefault()
+ .getPluginProperties().getString( "PrefPage_CertificateValidationPreferencePage_id" ); //$NON-NLS-1$
PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn( Display.getDefault()
.getActiveShell(), certificateValidationPreferencePageId, new String[]