You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2007/11/18 21:58:40 UTC
svn commit: r596130 [1/2] - in /directory/studio/trunk:
studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/
studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/valueeditors/
studio-ldapbrowser...
Author: seelmann
Date: Sun Nov 18 12:58:35 2007
New Revision: 596130
URL: http://svn.apache.org/viewvc?rev=596130&view=rev
Log:
Renamed and reorganized LDIF parser packages
Added:
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/LdifFormatParameters.java (contents, props changed)
- copied, changed from r596116, directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifFormatParameters.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java (contents, props changed)
- copied, changed from r596116, directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/LdifUtils.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEOFPart.java
- copied, changed from r596116, directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifEOFPart.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEnumeration.java
- copied, changed from r596116, directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifEnumeration.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifFile.java
- copied, changed from r596116, directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifFile.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifInvalidPart.java
- copied, changed from r596116, directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifInvalidPart.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifPart.java
- copied, changed from r596116, directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifPart.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/
- copied from r596116, directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/container/
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/
- copied from r596116, directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/lines/
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/parser/
- copied from r596116, directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/parser/
Removed:
directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/LdifUtils.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/
Modified:
directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserAction.java
directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/CopyAction.java
directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java
directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java
directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifJob.java
directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvJob.java
directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifJob.java
directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsJob.java
directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifJob.java
directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemasJob.java
directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/Control.java
directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/Password.java
directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ModificationLogger.java
directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java
directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaPart.java
directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/AttributeComparator.java
directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java
directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java
directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java
directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsLdifAction.java
directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyValueAction.java
directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/EncoderDecoderDialog.java
directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorOutlinePage.java
directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ModificationLogsViewUniversalListener.java
directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationLdifWizardPage.java
directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationModifyWizardPage.java
directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewEntryTypeWizardPage.java
directory/studio/trunk/studio-ldif-parser/META-INF/MANIFEST.MF
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeAddRecord.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeDeleteRecord.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModDnRecord.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModifyRecord.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeRecord.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifCommentContainer.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifContainer.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifContentRecord.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifEOFContainer.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifInvalidContainer.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifModSpec.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifRecord.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifSepContainer.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifVersionContainer.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifAttrValLine.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifChangeTypeLine.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifCommentLine.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifControlLine.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDeloldrdnLine.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLine.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifLineBase.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifModSpecSepLine.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifModSpecTypeLine.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewrdnLine.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewsuperiorLine.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNonEmptyLineBase.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifSepLine.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifValueLineBase.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifVersionLine.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/parser/DummyLdifContainer.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifParser.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifScanner.java
directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifToken.java
directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/LdifEntryEditorDialog.java
directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java
directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ILdifEditor.java
directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifDocumentProvider.java
directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java
directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifOutlinePage.java
directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractLdifAction.java
directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java
directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java
directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifRecordAction.java
directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/FormatLdifDocumentAction.java
directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/FormatLdifRecordAction.java
directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/reconciler/LdifAnnotationUpdater.java
directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/reconciler/LdifFoldingRegionUpdater.java
directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifAnnotationHover.java
directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifAutoEditStrategy.java
directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifCompletionProcessor.java
directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifDamagerRepairer.java
directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifDoubleClickStrategy.java
directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifTextHover.java
directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/widgets/LdifEditorWidget.java
Modified: directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserAction.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserAction.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserAction.java Sun Nov 18 12:58:35 2007
@@ -32,9 +32,9 @@
import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult;
import org.apache.directory.studio.ldapbrowser.core.model.IValue;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.LdifFile;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.LdifPart;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContainer;
+import org.apache.directory.studio.ldifparser.model.LdifFile;
+import org.apache.directory.studio.ldifparser.model.LdifPart;
+import org.apache.directory.studio.ldifparser.model.container.LdifContainer;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ISelection;
Modified: directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/CopyAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/CopyAction.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/CopyAction.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/CopyAction.java Sun Nov 18 12:58:35 2007
@@ -31,7 +31,7 @@
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.IValue;
-import org.apache.directory.studio.ldapbrowser.core.utils.LdifUtils;
+import org.apache.directory.studio.ldifparser.LdifUtils;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.dnd.Clipboard;
Modified: directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java Sun Nov 18 12:58:35 2007
@@ -43,8 +43,8 @@
import org.apache.directory.studio.ldapbrowser.core.model.schema.AttributeTypeDescription;
import org.apache.directory.studio.ldapbrowser.core.model.schema.LdapSyntaxDescription;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
-import org.apache.directory.studio.ldapbrowser.core.utils.LdifUtils;
import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
+import org.apache.directory.studio.ldifparser.LdifUtils;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java Sun Nov 18 12:58:35 2007
@@ -67,7 +67,7 @@
import org.apache.directory.studio.ldapbrowser.core.model.impl.BrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.impl.Search;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
-import org.apache.directory.studio.ldapbrowser.core.utils.LdifUtils;
+import org.apache.directory.studio.ldifparser.LdifUtils;
import org.eclipse.core.runtime.IPath;
Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifJob.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifJob.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifJob.java Sun Nov 18 12:58:35 2007
@@ -32,8 +32,8 @@
import org.apache.directory.studio.connection.core.StudioProgressMonitor;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.LdifEnumeration;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.parser.LdifParser;
+import org.apache.directory.studio.ldifparser.model.LdifEnumeration;
+import org.apache.directory.studio.ldifparser.parser.LdifParser;
/**
Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvJob.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvJob.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvJob.java Sun Nov 18 12:58:35 2007
@@ -40,10 +40,10 @@
import org.apache.directory.studio.ldapbrowser.core.model.ConnectionException;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.SearchParameter;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContainer;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContentRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifAttrValLine;
-import org.apache.directory.studio.ldapbrowser.core.utils.LdifUtils;
+import org.apache.directory.studio.ldifparser.LdifUtils;
+import org.apache.directory.studio.ldifparser.model.container.LdifContainer;
+import org.apache.directory.studio.ldifparser.model.container.LdifContentRecord;
+import org.apache.directory.studio.ldifparser.model.lines.LdifAttrValLine;
import org.eclipse.core.runtime.Preferences;
Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifJob.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifJob.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifJob.java Sun Nov 18 12:58:35 2007
@@ -41,15 +41,15 @@
import org.apache.directory.studio.ldapbrowser.core.model.ConnectionException;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.SearchParameter;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.LdifEnumeration;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContainer;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContentRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifAttrValLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifDnLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifSepLine;
import org.apache.directory.studio.ldapbrowser.core.utils.AttributeComparator;
import org.apache.directory.studio.ldapbrowser.core.utils.JNDIUtils;
-import org.apache.directory.studio.ldapbrowser.core.utils.LdifUtils;
+import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
+import org.apache.directory.studio.ldifparser.model.LdifEnumeration;
+import org.apache.directory.studio.ldifparser.model.container.LdifContainer;
+import org.apache.directory.studio.ldifparser.model.container.LdifContentRecord;
+import org.apache.directory.studio.ldifparser.model.lines.LdifAttrValLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifDnLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifSepLine;
/**
@@ -168,7 +168,7 @@
newRecord.addAttrVal( attrValLines[i] );
}
newRecord.finish( sepLine );
- String s = newRecord.toFormattedString( LdifUtils.getLdifFormatParameters() );
+ String s = newRecord.toFormattedString( Utils.getLdifFormatParameters() );
// String s = record.toFormattedString();
bufferedWriter.write( s );
Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsJob.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsJob.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsJob.java Sun Nov 18 12:58:35 2007
@@ -36,8 +36,8 @@
import org.apache.directory.studio.ldapbrowser.core.model.ConnectionException;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.SearchParameter;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContainer;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContentRecord;
+import org.apache.directory.studio.ldifparser.model.container.LdifContainer;
+import org.apache.directory.studio.ldifparser.model.container.LdifContentRecord;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifJob.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifJob.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifJob.java Sun Nov 18 12:58:35 2007
@@ -56,24 +56,24 @@
import org.apache.directory.studio.ldapbrowser.core.model.ConnectionException;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.LdifEnumeration;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.LdifFormatParameters;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifChangeAddRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifChangeDeleteRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifChangeModDnRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifChangeModifyRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifChangeRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContainer;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContentRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifModSpec;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifAttrValLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifCommentLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifControlLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifModSpecTypeLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.parser.LdifParser;
import org.apache.directory.studio.ldapbrowser.core.utils.DnUtils;
-import org.apache.directory.studio.ldapbrowser.core.utils.LdifUtils;
+import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
+import org.apache.directory.studio.ldifparser.LdifFormatParameters;
+import org.apache.directory.studio.ldifparser.model.LdifEnumeration;
+import org.apache.directory.studio.ldifparser.model.container.LdifChangeAddRecord;
+import org.apache.directory.studio.ldifparser.model.container.LdifChangeDeleteRecord;
+import org.apache.directory.studio.ldifparser.model.container.LdifChangeModDnRecord;
+import org.apache.directory.studio.ldifparser.model.container.LdifChangeModifyRecord;
+import org.apache.directory.studio.ldifparser.model.container.LdifChangeRecord;
+import org.apache.directory.studio.ldifparser.model.container.LdifContainer;
+import org.apache.directory.studio.ldifparser.model.container.LdifContentRecord;
+import org.apache.directory.studio.ldifparser.model.container.LdifModSpec;
+import org.apache.directory.studio.ldifparser.model.container.LdifRecord;
+import org.apache.directory.studio.ldifparser.model.lines.LdifAttrValLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifCommentLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifControlLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifModSpecTypeLine;
+import org.apache.directory.studio.ldifparser.parser.LdifParser;
/**
@@ -517,7 +517,7 @@
{
try
{
- LdifFormatParameters ldifFormatParameters = LdifUtils.getLdifFormatParameters();
+ LdifFormatParameters ldifFormatParameters = Utils.getLdifFormatParameters();
DateFormat df = new SimpleDateFormat( BrowserCoreConstants.DATEFORMAT );
String errorComment = "#!ERROR " + exception.getMessage(); //$NON-NLS-1$
@@ -556,7 +556,7 @@
{
try
{
- LdifFormatParameters ldifFormatParameters = LdifUtils.getLdifFormatParameters();
+ LdifFormatParameters ldifFormatParameters = Utils.getLdifFormatParameters();
DateFormat df = new SimpleDateFormat( BrowserCoreConstants.DATEFORMAT );
logWriter.write( LdifCommentLine.create( "#!RESULT OK" ).toFormattedString( ldifFormatParameters ) ); //$NON-NLS-1$
logWriter
Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemasJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemasJob.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemasJob.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemasJob.java Sun Nov 18 12:58:35 2007
@@ -32,9 +32,9 @@
import org.apache.directory.studio.ldapbrowser.core.model.IRootDSE;
import org.apache.directory.studio.ldapbrowser.core.model.SearchParameter;
import org.apache.directory.studio.ldapbrowser.core.model.ISearch.SearchScope;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.LdifEnumeration;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContentRecord;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
+import org.apache.directory.studio.ldifparser.model.LdifEnumeration;
+import org.apache.directory.studio.ldifparser.model.container.LdifContentRecord;
/**
Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/Control.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/Control.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/Control.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/Control.java Sun Nov 18 12:58:35 2007
@@ -23,7 +23,7 @@
import java.io.Serializable;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifControlLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifControlLine;
/**
Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/Password.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/Password.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/Password.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/Password.java Sun Nov 18 12:58:35 2007
@@ -26,8 +26,8 @@
import java.security.SecureRandom;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
-import org.apache.directory.studio.ldapbrowser.core.utils.LdifUtils;
import org.apache.directory.studio.ldapbrowser.core.utils.UnixCrypt;
+import org.apache.directory.studio.ldifparser.LdifUtils;
/**
Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ModificationLogger.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ModificationLogger.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ModificationLogger.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ModificationLogger.java Sun Nov 18 12:58:35 2007
@@ -48,20 +48,20 @@
import org.apache.directory.studio.connection.core.IModificationLogger;
import org.apache.directory.studio.ldapbrowser.core.BrowserConnectionManager;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.LdifFormatParameters;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifChangeAddRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifChangeDeleteRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifChangeModDnRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifChangeModifyRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifModSpec;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifAttrValLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifCommentLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifDeloldrdnLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifModSpecSepLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifNewrdnLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifNewsuperiorLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifSepLine;
import org.apache.directory.studio.ldapbrowser.core.utils.DnUtils;
+import org.apache.directory.studio.ldifparser.LdifFormatParameters;
+import org.apache.directory.studio.ldifparser.model.container.LdifChangeAddRecord;
+import org.apache.directory.studio.ldifparser.model.container.LdifChangeDeleteRecord;
+import org.apache.directory.studio.ldifparser.model.container.LdifChangeModDnRecord;
+import org.apache.directory.studio.ldifparser.model.container.LdifChangeModifyRecord;
+import org.apache.directory.studio.ldifparser.model.container.LdifModSpec;
+import org.apache.directory.studio.ldifparser.model.lines.LdifAttrValLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifCommentLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifDeloldrdnLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifModSpecSepLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifNewrdnLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifNewsuperiorLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifSepLine;
/**
Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java Sun Nov 18 12:58:35 2007
@@ -30,8 +30,8 @@
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.IValue;
-import org.apache.directory.studio.ldapbrowser.core.utils.LdifUtils;
import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
+import org.apache.directory.studio.ldifparser.LdifUtils;
import org.eclipse.search.ui.ISearchPageScoreComputer;
Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java Sun Nov 18 12:58:35 2007
@@ -40,14 +40,14 @@
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.studio.ldapbrowser.core.model.AttributeDescription;
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.LdifEnumeration;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.LdifFormatParameters;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContainer;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContentRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifAttrValLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.parser.LdifParser;
import org.apache.directory.studio.ldapbrowser.core.model.schema.parser.SchemaLexer;
import org.apache.directory.studio.ldapbrowser.core.model.schema.parser.SchemaParser;
+import org.apache.directory.studio.ldifparser.LdifFormatParameters;
+import org.apache.directory.studio.ldifparser.model.LdifEnumeration;
+import org.apache.directory.studio.ldifparser.model.container.LdifContainer;
+import org.apache.directory.studio.ldifparser.model.container.LdifContentRecord;
+import org.apache.directory.studio.ldifparser.model.lines.LdifAttrValLine;
+import org.apache.directory.studio.ldifparser.parser.LdifParser;
public class Schema implements Serializable
Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaPart.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaPart.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaPart.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaPart.java Sun Nov 18 12:58:35 2007
@@ -23,7 +23,7 @@
import java.io.Serializable;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifAttrValLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifAttrValLine;
public abstract class SchemaPart implements Comparable, Serializable
Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/AttributeComparator.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/AttributeComparator.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/AttributeComparator.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/AttributeComparator.java Sun Nov 18 12:58:35 2007
@@ -30,7 +30,7 @@
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.IValue;
import org.apache.directory.studio.ldapbrowser.core.model.impl.DummyEntry;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifAttrValLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifAttrValLine;
public class AttributeComparator implements Comparator
Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java Sun Nov 18 12:58:35 2007
@@ -27,6 +27,7 @@
import javax.naming.InvalidNameException;
import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
@@ -35,17 +36,18 @@
import org.apache.directory.studio.ldapbrowser.core.model.impl.Attribute;
import org.apache.directory.studio.ldapbrowser.core.model.impl.DummyEntry;
import org.apache.directory.studio.ldapbrowser.core.model.impl.Value;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.LdifPart;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifChangeAddRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifChangeRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContentRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifAttrValLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifChangeTypeLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifCommentLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifControlLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifDnLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifSepLine;
+import org.apache.directory.studio.ldifparser.LdifUtils;
+import org.apache.directory.studio.ldifparser.model.LdifPart;
+import org.apache.directory.studio.ldifparser.model.container.LdifChangeAddRecord;
+import org.apache.directory.studio.ldifparser.model.container.LdifChangeRecord;
+import org.apache.directory.studio.ldifparser.model.container.LdifContentRecord;
+import org.apache.directory.studio.ldifparser.model.container.LdifRecord;
+import org.apache.directory.studio.ldifparser.model.lines.LdifAttrValLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifChangeTypeLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifCommentLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifControlLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifDnLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifSepLine;
public class ModelConverter
@@ -293,4 +295,35 @@
}
}
+ /**
+ * Gets the string value from the given {@link IValue}. If the given
+ * {@link IValue} is binary is is encoded according to the regquested
+ * encoding type.
+ *
+ * @param value the value
+ * @param binaryEncoding the binary encoding type
+ *
+ * @return the string value
+ */
+ public static String getStringValue( IValue value, int binaryEncoding )
+ {
+ String s = value.getStringValue();
+ if ( value.isBinary() && LdifUtils.mustEncode( s ) )
+ {
+ byte[] binary = value.getBinaryValue();
+ if ( binaryEncoding == BrowserCoreConstants.BINARYENCODING_BASE64 )
+ {
+ s = LdifUtils.base64encode( binary );
+ }
+ else if ( binaryEncoding == BrowserCoreConstants.BINARYENCODING_HEX )
+ {
+ s = LdifUtils.hexEncode( binary );
+ }
+ else
+ {
+ s = BrowserCoreConstants.BINARY;
+ }
+ }
+ return s;
+ }
}
Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java Sun Nov 18 12:58:35 2007
@@ -30,6 +30,12 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
+import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
+import org.apache.directory.studio.ldifparser.LdifFormatParameters;
+import org.apache.directory.studio.ldifparser.LdifUtils;
+import org.eclipse.core.runtime.Preferences;
+
public class Utils
{
@@ -200,6 +206,17 @@
}
return false;
+ }
+
+
+ public static LdifFormatParameters getLdifFormatParameters()
+ {
+ Preferences store = BrowserCorePlugin.getDefault().getPluginPreferences();
+ boolean spaceAfterColon = store.getBoolean( BrowserCoreConstants.PREFERENCE_LDIF_SPACE_AFTER_COLON );
+ int lineWidth = store.getInt( BrowserCoreConstants.PREFERENCE_LDIF_LINE_WIDTH );
+ String lineSeparator = store.getString( BrowserCoreConstants.PREFERENCE_LDIF_LINE_SEPARATOR );
+ LdifFormatParameters ldifFormatParameters = new LdifFormatParameters( spaceAfterColon, lineWidth, lineSeparator );
+ return ldifFormatParameters;
}
}
Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java Sun Nov 18 12:58:35 2007
@@ -37,7 +37,7 @@
import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult;
import org.apache.directory.studio.ldapbrowser.core.model.IValue;
import org.apache.directory.studio.ldapbrowser.core.utils.AttributeComparator;
-import org.apache.directory.studio.ldapbrowser.core.utils.LdifUtils;
+import org.apache.directory.studio.ldapbrowser.core.utils.ModelConverter;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
import org.eclipse.jface.resource.ImageDescriptor;
@@ -291,7 +291,7 @@
for ( int v = 0; v < values.length; v++ )
{
- String val = LdifUtils.getStringValue( values[v], binaryEncoding );
+ String val = ModelConverter.getStringValue( values[v], binaryEncoding );
valueSB.append( val );
if ( v + 1 < values.length )
{
Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsLdifAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsLdifAction.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsLdifAction.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsLdifAction.java Sun Nov 18 12:58:35 2007
@@ -34,11 +34,10 @@
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.IValue;
import org.apache.directory.studio.ldapbrowser.core.utils.AttributeComparator;
-import org.apache.directory.studio.ldapbrowser.core.utils.LdifUtils;
import org.apache.directory.studio.ldapbrowser.core.utils.ModelConverter;
+import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
-
import org.eclipse.jface.resource.ImageDescriptor;
@@ -165,7 +164,7 @@
*/
protected void serializeValue( IValue value, StringBuffer text )
{
- text.append( ModelConverter.valueToLdifAttrValLine( value ).toFormattedString( LdifUtils.getLdifFormatParameters() ) );
+ text.append( ModelConverter.valueToLdifAttrValLine( value ).toFormattedString( Utils.getLdifFormatParameters() ) );
}
@@ -179,6 +178,6 @@
*/
protected void serializeDn( LdapDN dn, StringBuffer text )
{
- text.append( ModelConverter.dnToLdifDnLine( dn ).toFormattedString( LdifUtils.getLdifFormatParameters() ) );
+ text.append( ModelConverter.dnToLdifDnLine( dn ).toFormattedString( Utils.getLdifFormatParameters() ) );
}
}
Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyValueAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyValueAction.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyValueAction.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyValueAction.java Sun Nov 18 12:58:35 2007
@@ -32,11 +32,11 @@
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
import org.apache.directory.studio.ldapbrowser.core.model.IValue;
-import org.apache.directory.studio.ldapbrowser.core.utils.LdifUtils;
import org.apache.directory.studio.ldapbrowser.core.utils.ModelConverter;
+import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
-
+import org.apache.directory.studio.ldifparser.LdifUtils;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.dnd.TextTransfer;
import org.eclipse.swt.dnd.Transfer;
@@ -193,7 +193,7 @@
}
else if ( mode == MODE_LDIF )
{
- text.append( ModelConverter.valueToLdifAttrValLine( value ).toFormattedString( LdifUtils.getLdifFormatParameters() ) );
+ text.append( ModelConverter.valueToLdifAttrValLine( value ).toFormattedString( Utils.getLdifFormatParameters() ) );
}
}
@@ -216,7 +216,7 @@
}
else if ( mode == MODE_LDIF )
{
- text.append( ModelConverter.dnToLdifDnLine( dn ).toFormattedString( LdifUtils.getLdifFormatParameters() ) );
+ text.append( ModelConverter.dnToLdifDnLine( dn ).toFormattedString( Utils.getLdifFormatParameters() ) );
}
}
Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/EncoderDecoderDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/EncoderDecoderDialog.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/EncoderDecoderDialog.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/EncoderDecoderDialog.java Sun Nov 18 12:58:35 2007
@@ -22,7 +22,7 @@
import org.apache.directory.studio.ldapbrowser.common.widgets.BaseWidgetUtils;
-import org.apache.directory.studio.ldapbrowser.core.utils.LdifUtils;
+import org.apache.directory.studio.ldifparser.LdifUtils;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.swt.SWT;
Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorOutlinePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorOutlinePage.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorOutlinePage.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorOutlinePage.java Sun Nov 18 12:58:35 2007
@@ -31,20 +31,20 @@
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.IValue;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.LdifFile;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifChangeAddRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifChangeDeleteRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifChangeModDnRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifChangeModifyRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContentRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifModSpec;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifAttrValLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.parser.LdifParser;
import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
import org.apache.directory.studio.ldapbrowser.ui.actions.CopyEntryAsLdifAction;
import org.apache.directory.studio.ldifeditor.LdifEditorActivator;
import org.apache.directory.studio.ldifeditor.LdifEditorConstants;
+import org.apache.directory.studio.ldifparser.model.LdifFile;
+import org.apache.directory.studio.ldifparser.model.container.LdifChangeAddRecord;
+import org.apache.directory.studio.ldifparser.model.container.LdifChangeDeleteRecord;
+import org.apache.directory.studio.ldifparser.model.container.LdifChangeModDnRecord;
+import org.apache.directory.studio.ldifparser.model.container.LdifChangeModifyRecord;
+import org.apache.directory.studio.ldifparser.model.container.LdifContentRecord;
+import org.apache.directory.studio.ldifparser.model.container.LdifModSpec;
+import org.apache.directory.studio.ldifparser.model.container.LdifRecord;
+import org.apache.directory.studio.ldifparser.model.lines.LdifAttrValLine;
+import org.apache.directory.studio.ldifparser.parser.LdifParser;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ISelectionChangedListener;
Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ModificationLogsViewUniversalListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ModificationLogsViewUniversalListener.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ModificationLogsViewUniversalListener.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ModificationLogsViewUniversalListener.java Sun Nov 18 12:58:35 2007
@@ -35,8 +35,8 @@
import org.apache.directory.studio.ldapbrowser.core.events.EntryUpdateListener;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContainer;
import org.apache.directory.studio.ldapbrowser.ui.views.connection.ConnectionView;
+import org.apache.directory.studio.ldifparser.model.container.LdifContainer;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.ui.INullSelectionListener;
import org.eclipse.ui.IWorkbenchPart;
Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationLdifWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationLdifWizardPage.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationLdifWizardPage.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationLdifWizardPage.java Sun Nov 18 12:58:35 2007
@@ -24,9 +24,9 @@
import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.LdifFile;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContainer;
import org.apache.directory.studio.ldifeditor.widgets.LdifEditorWidget;
+import org.apache.directory.studio.ldifparser.model.LdifFile;
+import org.apache.directory.studio.ldifparser.model.container.LdifContainer;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationModifyWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationModifyWizardPage.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationModifyWizardPage.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationModifyWizardPage.java Sun Nov 18 12:58:35 2007
@@ -25,10 +25,10 @@
import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.LdifFile;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContainer;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.parser.LdifParser;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
+import org.apache.directory.studio.ldifparser.model.LdifFile;
+import org.apache.directory.studio.ldifparser.model.container.LdifContainer;
+import org.apache.directory.studio.ldifparser.parser.LdifParser;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewEntryTypeWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewEntryTypeWizardPage.java?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewEntryTypeWizardPage.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewEntryTypeWizardPage.java Sun Nov 18 12:58:35 2007
@@ -35,11 +35,11 @@
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.impl.DummyConnection;
import org.apache.directory.studio.ldapbrowser.core.model.impl.DummyEntry;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContentRecord;
import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
import org.apache.directory.studio.ldapbrowser.core.utils.ModelConverter;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
+import org.apache.directory.studio.ldifparser.model.container.LdifContentRecord;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.WizardPage;
Modified: directory/studio/trunk/studio-ldif-parser/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldif-parser/META-INF/MANIFEST.MF?rev=596130&r1=596129&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldif-parser/META-INF/MANIFEST.MF (original)
+++ directory/studio/trunk/studio-ldif-parser/META-INF/MANIFEST.MF Sun Nov 18 12:58:35 2007
@@ -8,7 +8,8 @@
Bundle-ClassPath: .,
lib/commons-codec-1.3.jar
Export-Package:
- org.apache.directory.studio.ldapbrowser.core.model.ldif,
- org.apache.directory.studio.ldapbrowser.core.model.ldif.container,
- org.apache.directory.studio.ldapbrowser.core.model.ldif.lines,
- org.apache.directory.studio.ldapbrowser.core.model.ldif.parser
+ org.apache.directory.studio.ldifparser,
+ org.apache.directory.studio.ldifparser.model,
+ org.apache.directory.studio.ldifparser.model.container,
+ org.apache.directory.studio.ldifparser.model.lines,
+ org.apache.directory.studio.ldifparser.parser
Copied: directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/LdifFormatParameters.java (from r596116, directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifFormatParameters.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/LdifFormatParameters.java?p2=directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/LdifFormatParameters.java&p1=directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifFormatParameters.java&r1=596116&r2=596130&rev=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifFormatParameters.java (original)
+++ directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/LdifFormatParameters.java Sun Nov 18 12:58:35 2007
@@ -17,10 +17,9 @@
* under the License.
*
*/
-package org.apache.directory.studio.ldapbrowser.core.model.ldif;
+package org.apache.directory.studio.ldifparser;
-import org.apache.directory.studio.ldifparser.LdifParserConstants;
public class LdifFormatParameters
Propchange: directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/LdifFormatParameters.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java (from r596116, directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/LdifUtils.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java?p2=directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java&p1=directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/LdifUtils.java&r1=596116&r2=596130&rev=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/LdifUtils.java (original)
+++ directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java Sun Nov 18 12:58:35 2007
@@ -18,7 +18,7 @@
*
*/
-package org.apache.directory.studio.ldapbrowser.core.utils;
+package org.apache.directory.studio.ldifparser;
import java.io.UnsupportedEncodingException;
Propchange: directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEOFPart.java (from r596116, directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifEOFPart.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEOFPart.java?p2=directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEOFPart.java&p1=directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifEOFPart.java&r1=596116&r2=596130&rev=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifEOFPart.java (original)
+++ directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEOFPart.java Sun Nov 18 12:58:35 2007
@@ -18,7 +18,9 @@
*
*/
-package org.apache.directory.studio.ldapbrowser.core.model.ldif;
+package org.apache.directory.studio.ldifparser.model;
+
+import org.apache.directory.studio.ldifparser.LdifFormatParameters;
public final class LdifEOFPart implements LdifPart
Copied: directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEnumeration.java (from r596116, directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifEnumeration.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEnumeration.java?p2=directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEnumeration.java&p1=directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifEnumeration.java&r1=596116&r2=596130&rev=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifEnumeration.java (original)
+++ directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEnumeration.java Sun Nov 18 12:58:35 2007
@@ -18,12 +18,12 @@
*
*/
-package org.apache.directory.studio.ldapbrowser.core.model.ldif;
+package org.apache.directory.studio.ldifparser.model;
import java.util.Iterator;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContainer;
+import org.apache.directory.studio.ldifparser.model.container.LdifContainer;
public interface LdifEnumeration
Copied: directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifFile.java (from r596116, directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifFile.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifFile.java?p2=directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifFile.java&p1=directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifFile.java&r1=596116&r2=596130&rev=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifFile.java (original)
+++ directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifFile.java Sun Nov 18 12:58:35 2007
@@ -18,7 +18,7 @@
*
*/
-package org.apache.directory.studio.ldapbrowser.core.model.ldif;
+package org.apache.directory.studio.ldifparser.model;
import java.io.Serializable;
@@ -27,11 +27,12 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifChangeRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContainer;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContentRecord;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifModSpec;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifRecord;
+import org.apache.directory.studio.ldifparser.LdifFormatParameters;
+import org.apache.directory.studio.ldifparser.model.container.LdifChangeRecord;
+import org.apache.directory.studio.ldifparser.model.container.LdifContainer;
+import org.apache.directory.studio.ldifparser.model.container.LdifContentRecord;
+import org.apache.directory.studio.ldifparser.model.container.LdifModSpec;
+import org.apache.directory.studio.ldifparser.model.container.LdifRecord;
public class LdifFile implements Serializable
@@ -309,7 +310,7 @@
}
}
- return ( LdifPart[] ) partList.toArray( new LdifPart[partList.size()] );
+ return (org.apache.directory.studio.ldifparser.model.LdifPart[] ) partList.toArray( new LdifPart[partList.size()] );
}
Copied: directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifInvalidPart.java (from r596116, directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifInvalidPart.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifInvalidPart.java?p2=directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifInvalidPart.java&p1=directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifInvalidPart.java&r1=596116&r2=596130&rev=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifInvalidPart.java (original)
+++ directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifInvalidPart.java Sun Nov 18 12:58:35 2007
@@ -18,7 +18,9 @@
*
*/
-package org.apache.directory.studio.ldapbrowser.core.model.ldif;
+package org.apache.directory.studio.ldifparser.model;
+
+import org.apache.directory.studio.ldifparser.LdifFormatParameters;
public final class LdifInvalidPart implements LdifPart
Copied: directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifPart.java (from r596116, directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifPart.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifPart.java?p2=directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifPart.java&p1=directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifPart.java&r1=596116&r2=596130&rev=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifPart.java (original)
+++ directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifPart.java Sun Nov 18 12:58:35 2007
@@ -18,10 +18,12 @@
*
*/
-package org.apache.directory.studio.ldapbrowser.core.model.ldif;
+package org.apache.directory.studio.ldifparser.model;
import java.io.Serializable;
+
+import org.apache.directory.studio.ldifparser.LdifFormatParameters;
public interface LdifPart extends Serializable
Modified: directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeAddRecord.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeAddRecord.java?rev=596130&r1=596116&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeAddRecord.java (original)
+++ directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeAddRecord.java Sun Nov 18 12:58:35 2007
@@ -18,16 +18,16 @@
*
*/
-package org.apache.directory.studio.ldapbrowser.core.model.ldif.container;
+package org.apache.directory.studio.ldifparser.model.container;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifAttrValLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifChangeTypeLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifDnLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifAttrValLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifChangeTypeLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifDnLine;
public class LdifChangeAddRecord extends LdifChangeRecord
Modified: directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeDeleteRecord.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeDeleteRecord.java?rev=596130&r1=596116&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeDeleteRecord.java (original)
+++ directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeDeleteRecord.java Sun Nov 18 12:58:35 2007
@@ -18,11 +18,11 @@
*
*/
-package org.apache.directory.studio.ldapbrowser.core.model.ldif.container;
+package org.apache.directory.studio.ldifparser.model.container;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifChangeTypeLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifDnLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifChangeTypeLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifDnLine;
public class LdifChangeDeleteRecord extends LdifChangeRecord
Modified: directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModDnRecord.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModDnRecord.java?rev=596130&r1=596116&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModDnRecord.java (original)
+++ directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModDnRecord.java Sun Nov 18 12:58:35 2007
@@ -18,16 +18,16 @@
*
*/
-package org.apache.directory.studio.ldapbrowser.core.model.ldif.container;
+package org.apache.directory.studio.ldifparser.model.container;
import java.util.Iterator;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifChangeTypeLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifDeloldrdnLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifDnLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifNewrdnLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifNewsuperiorLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifChangeTypeLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifDeloldrdnLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifDnLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifNewrdnLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifNewsuperiorLine;
public class LdifChangeModDnRecord extends LdifChangeRecord
Modified: directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModifyRecord.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModifyRecord.java?rev=596130&r1=596116&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModifyRecord.java (original)
+++ directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModifyRecord.java Sun Nov 18 12:58:35 2007
@@ -18,15 +18,15 @@
*
*/
-package org.apache.directory.studio.ldapbrowser.core.model.ldif.container;
+package org.apache.directory.studio.ldifparser.model.container;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifChangeTypeLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifDnLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifChangeTypeLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifDnLine;
public class LdifChangeModifyRecord extends LdifChangeRecord
Modified: directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeRecord.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeRecord.java?rev=596130&r1=596116&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeRecord.java (original)
+++ directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeRecord.java Sun Nov 18 12:58:35 2007
@@ -18,16 +18,16 @@
*
*/
-package org.apache.directory.studio.ldapbrowser.core.model.ldif.container;
+package org.apache.directory.studio.ldifparser.model.container;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifChangeTypeLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifControlLine;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifDnLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifChangeTypeLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifControlLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifDnLine;
public class LdifChangeRecord extends LdifRecord
Modified: directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifCommentContainer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifCommentContainer.java?rev=596130&r1=596116&r2=596130&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifCommentContainer.java (original)
+++ directory/studio/trunk/studio-ldif-parser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifCommentContainer.java Sun Nov 18 12:58:35 2007
@@ -18,10 +18,10 @@
*
*/
-package org.apache.directory.studio.ldapbrowser.core.model.ldif.container;
+package org.apache.directory.studio.ldifparser.model.container;
-import org.apache.directory.studio.ldapbrowser.core.model.ldif.lines.LdifCommentLine;
+import org.apache.directory.studio.ldifparser.model.lines.LdifCommentLine;
public class LdifCommentContainer extends LdifContainer