directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r701774 - in /directory/studio/trunk: connection-ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/ ldapbrowser-help/ ldapbrowser-help/src/main/resources/
Date Sun, 05 Oct 2008 10:48:44 GMT
Author: seelmann
Date: Sun Oct  5 03:48:43 2008
New Revision: 701774

URL: http://svn.apache.org/viewvc?rev=701774&view=rev
Log:
Fixed dynamc help

Added:
    directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-connection-ui.xml
      - copied, changed from r701629, directory/studio/trunk/ldapbrowser-help/plugin.xml
    directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-ldapbrowser-common.xml
    directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-ldapbrowser-ui.xml
      - copied, changed from r701629, directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts.xml
Modified:
    directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/NewConnectionWizard.java
    directory/studio/trunk/ldapbrowser-help/plugin.xml
    directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts.xml

Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/NewConnectionWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/NewConnectionWizard.java?rev=701774&r1=701773&r2=701774&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/NewConnectionWizard.java
(original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/NewConnectionWizard.java
Sun Oct  5 03:48:43 2008
@@ -35,6 +35,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PlatformUI;
 
 
 /**
@@ -126,12 +127,11 @@
     {
         super.createPageControls( pageContainer );
 
-        // TODO: set help context ID, move help from browser-help plugin to connections-help
plugin 
-        //        for ( NewConnectionWizardPage wizardPage : wizardPages )
-        //        {
-        //            PlatformUI.getWorkbench().getHelpSystem().setHelp( wizardPage.getControl(),
-        //                ConnectionUIPlugin.PLUGIN_ID + "." + "tools_newconnection_wizard"
);
-        //        }
+        for ( NewConnectionWizardPage wizardPage : wizardPages )
+        {
+            PlatformUI.getWorkbench().getHelpSystem().setHelp( wizardPage.getControl(),
+                ConnectionUIConstants.PLUGIN_ID + "." + "tools_newconnection_wizard" );
+        }
     }
 
 

Modified: directory/studio/trunk/ldapbrowser-help/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/plugin.xml?rev=701774&r1=701773&r2=701774&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-help/plugin.xml (original)
+++ directory/studio/trunk/ldapbrowser-help/plugin.xml Sun Oct  5 03:48:43 2008
@@ -19,11 +19,16 @@
   under the License.
 -->
 <plugin>
-
 	<extension point="org.eclipse.help.toc">
 		<toc file="toc.xml" primary="true" />
 	</extension>
 	<extension point="org.eclipse.help.contexts">
-		<contexts file="contexts.xml" plugin="org.apache.directory.studio.ldapbrowser.ui" />
+		<contexts file="contexts-ldapbrowser-ui.xml" plugin="org.apache.directory.studio.ldapbrowser.ui"
/>
+	</extension>
+	<extension point="org.eclipse.help.contexts">
+		<contexts file="contexts-ldapbrowser-common.xml" plugin="org.apache.directory.studio.ldapbrowser.common"
/>
+	</extension>
+	<extension point="org.eclipse.help.contexts">
+		<contexts file="contexts-connection-ui.xml" plugin="org.apache.directory.studio.connection.ui"
/>
 	</extension>
 </plugin>

Copied: directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-connection-ui.xml
(from r701629, directory/studio/trunk/ldapbrowser-help/plugin.xml)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-connection-ui.xml?p2=directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-connection-ui.xml&p1=directory/studio/trunk/ldapbrowser-help/plugin.xml&r1=701629&r2=701774&rev=701774&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-help/plugin.xml (original)
+++ directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-connection-ui.xml
Sun Oct  5 03:48:43 2008
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
+<?NLS TYPE="org.eclipse.help.contexts"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -18,12 +18,12 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<plugin>
-
-	<extension point="org.eclipse.help.toc">
-		<toc file="toc.xml" primary="true" />
-	</extension>
-	<extension point="org.eclipse.help.contexts">
-		<contexts file="contexts.xml" plugin="org.apache.directory.studio.ldapbrowser.ui" />
-	</extension>
-</plugin>
+<contexts>
+ 	<context id="tools_newconnection_wizard">
+   		<description>This wizard helps you to create a new connection to a LDAP directory.</description>
+   		<topic label="New LDAP Connection wizard" href="html/tools_newconnection_wizard.html"/>
+   		<topic label="Specify network parameters" href="html/tools_newconnection_wizard.html#tools_newconnection_wizard_1"/>
+   		<topic label="Specify authentication parameters" href="html/tools_newconnection_wizard.html#tools_newconnection_wizard_2"/>
+   		<topic label="Specify additional parameters" href="html/tools_newconnection_wizard.html#tools_newconnection_wizard_3"/>
+   	</context>
+</contexts>

Added: directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-ldapbrowser-common.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-ldapbrowser-common.xml?rev=701774&view=auto
==============================================================================
--- directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-ldapbrowser-common.xml
(added)
+++ directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-ldapbrowser-common.xml
Sun Oct  5 03:48:43 2008
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.contexts"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<contexts>
+ 	<context id="tools_newentry_wizard">
+   		<description>This wizard helps you to create a new entry in a LDAP directory.</description>
+   		<topic label="New Entry wizard" href="html/tools_newentry_wizard.html"/>
+   		<topic label="Select entry creation method" href="html/tools_newentry_wizard.html#tools_newentry_wizard_1"/>
+   		<topic label="Specify object classes" href="html/tools_newentry_wizard.html#tools_newentry_wizard_2"/>
+   		<topic label="Specifiy the distinguished name" href="html/tools_newentry_wizard.html#tools_newentry_wizard_3"/>
+   		<topic label="Enter attributes and values" href="html/tools_newentry_wizard.html#tools_newentry_wizard_4"/>
+   	</context>
+ 	<context id="tools_attribute_wizard">
+   		<description>This wizard is used to create or edit an attribute.</description>
+   		<topic label="Attribute wizard" href="html/tools_attribute_wizard.html"/>
+   		<topic label="Enter attribute type" href="html/tools_attribute_wizard.html#tools_attribute_wizard_1"/>
+   		<topic label="Specify options" href="html/tools_attribute_wizard.html#tools_attribute_wizard_2"/>
+   	</context>
+</contexts>

Copied: directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-ldapbrowser-ui.xml
(from r701629, directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts.xml)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-ldapbrowser-ui.xml?p2=directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-ldapbrowser-ui.xml&p1=directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts.xml&r1=701629&r2=701774&rev=701774&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts.xml (original)
+++ directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-ldapbrowser-ui.xml
Sun Oct  5 03:48:43 2008
@@ -19,7 +19,6 @@
   under the License.
 -->
 <contexts>
- 
  	<context id="tools_connections_view">
    		<description>The Connections view shows all the LDAP connections.</description>
    		<topic label="Connections view" href="html/tools_connections_view.html"/>
@@ -57,26 +56,9 @@
    		<description>The Modification Logs view shows all sucessful and failed modifications.</description>
    		<topic label="Modification Logs view" href="html/tools_modification_logs_view.html"/>
    	</context>
- 	<context id="tools_newconnection_wizard">
-   		<description>This wizard helps you to create a new connection to a LDAP directory.</description>
-   		<topic label="New LDAP Connection wizard" href="html/tools_newconnection_wizard.html"/>
-   		<topic label="Specify network parameters" href="html/tools_newconnection_wizard.html#tools_newconnection_wizard_1"/>
-   		<topic label="Specify authentication parameters" href="html/tools_newconnection_wizard.html#tools_newconnection_wizard_2"/>
-   		<topic label="Specify additional parameters" href="html/tools_newconnection_wizard.html#tools_newconnection_wizard_3"/>
-   	</context>
- 	<context id="tools_newentry_wizard">
-   		<description>This wizard helps you to create a new entry in a LDAP directory.</description>
-   		<topic label="New Entry wizard" href="html/tools_newentry_wizard.html"/>
-   		<topic label="Select entry creation method" href="html/tools_newentry_wizard.html#tools_newentry_wizard_1"/>
-   		<topic label="Specify object classes" href="html/tools_newentry_wizard.html#tools_newentry_wizard_2"/>
-   		<topic label="Specifiy the distinguished name" href="html/tools_newentry_wizard.html#tools_newentry_wizard_3"/>
-   		<topic label="Enter attributes and values" href="html/tools_newentry_wizard.html#tools_newentry_wizard_4"/>
-   	</context>
- 	<context id="tools_attribute_wizard">
-   		<description>This wizard is used to create or edit an attribute.</description>
-   		<topic label="Attribute wizard" href="html/tools_attribute_wizard.html"/>
-   		<topic label="Enter attribute type" href="html/tools_attribute_wizard.html#tools_attribute_wizard_1"/>
-   		<topic label="Specify options" href="html/tools_attribute_wizard.html#tools_attribute_wizard_2"/>
+ 	<context id="tools_search_logs_view">
+   		<description>The Search Logs view shows all sucessful and failed searches</description>
+   		<topic label="Search Logs view" href="html/tools_search_logs_view.html"/>
    	</context>
  	<context id="tools_search_dialog">
    		<description>In the LDAP Search page you can specify search parameters to query
a directory.</description>
@@ -114,6 +96,4 @@
    		<description>This wizard exports directory content to Excel files.</description>
    		<topic label="Excel Export wizard" href="html/tools_excelexport_wizard.html"/>
    	</context>
-
-    		
 </contexts>

Modified: directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts.xml?rev=701774&r1=701773&r2=701774&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts.xml (original)
+++ directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts.xml Sun Oct  5 03:48:43
2008
@@ -57,7 +57,12 @@
    		<description>The Modification Logs view shows all sucessful and failed modifications.</description>
    		<topic label="Modification Logs view" href="html/tools_modification_logs_view.html"/>
    	</context>
- 	<context id="tools_newconnection_wizard">
+ 	<context id="tools_search_logs_view">
+   		<description>The Search Logs view shows all sucessful and failed searches</description>
+   		<topic label="Search Logs view" href="html/tools_search_logs_view.html"/>
+   	</context>
+   	
+ 	<context id="org.apache.directory.studio.connection.ui.tools_newconnection_wizard">
    		<description>This wizard helps you to create a new connection to a LDAP directory.</description>
    		<topic label="New LDAP Connection wizard" href="html/tools_newconnection_wizard.html"/>
    		<topic label="Specify network parameters" href="html/tools_newconnection_wizard.html#tools_newconnection_wizard_1"/>



Mime
View raw message