directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r987577 [10/10] - in /directory/studio/branches/studio-rap/plugins: common.ui/src/main/java/org/apache/directory/studio/common/ui/ connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ connection.ui/src/main/java/org/apache...
Date Fri, 20 Aug 2010 17:07:23 GMT
Modified: directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/widgets/LdifEditorWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/widgets/LdifEditorWidget.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/widgets/LdifEditorWidget.java
(original)
+++ directory/studio/branches/studio-rap/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/widgets/LdifEditorWidget.java
Fri Aug 20 17:07:19 2010
@@ -29,13 +29,7 @@ import org.apache.directory.studio.ldife
 import org.apache.directory.studio.ldifeditor.editor.NonExistingLdifEditorInput;
 import org.apache.directory.studio.ldifparser.model.LdifFile;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextListener;
-import org.eclipse.jface.text.TextEvent;
-import org.eclipse.jface.text.source.SourceViewer;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -48,7 +42,7 @@ import org.eclipse.swt.widgets.Control;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class LdifEditorWidget extends BrowserWidget implements ILdifEditor, ITextListener
+public class LdifEditorWidget extends BrowserWidget implements ILdifEditor
 {
 
     /** The connection. */
@@ -67,7 +61,7 @@ public class LdifEditorWidget extends Br
     private LdifDocumentProvider documentProvider;
 
     /** The source viewer. */
-    private SourceViewer sourceViewer;
+//    private SourceViewer sourceViewer;
 
     /** The source viewer configuration. */
     private LdifSourceViewerConfiguration sourceViewerConfiguration;
@@ -98,8 +92,8 @@ public class LdifEditorWidget extends Br
     {
         if ( editorInput != null )
         {
-            sourceViewer.removeTextListener( this );
-            documentProvider.disconnect( editorInput );
+//            sourceViewer.removeTextListener( this );
+//            documentProvider.disconnect( editorInput );
             // documentProvider = null;
             editorInput = null;
         }
@@ -123,38 +117,38 @@ public class LdifEditorWidget extends Br
         // create source viewer
         // sourceViewer = new ProjectionViewer(parent, ruler,
         // getOverviewRuler(), true, styles);
-        sourceViewer = new SourceViewer( composite, null, null, false, SWT.BORDER | SWT.V_SCROLL
| SWT.H_SCROLL );
-        sourceViewer.getControl().setLayoutData( new GridData( GridData.FILL_BOTH ) );
-
-        // configure
-        sourceViewerConfiguration = new LdifSourceViewerConfiguration( this, this.contentAssistEnabled
);
-        sourceViewer.configure( sourceViewerConfiguration );
-
-        // set font
-        Font font = JFaceResources.getFont( JFaceResources.TEXT_FONT );
-        sourceViewer.getTextWidget().setFont( font );
+//        sourceViewer = new SourceViewer( composite, null, null, false, SWT.BORDER | SWT.V_SCROLL
| SWT.H_SCROLL );
+//        sourceViewer.getControl().setLayoutData( new GridData( GridData.FILL_BOTH ) );
+//
+//        // configure
+//        sourceViewerConfiguration = new LdifSourceViewerConfiguration( this, this.contentAssistEnabled
);
+//        sourceViewer.configure( sourceViewerConfiguration );
+//
+//        // set font
+//        Font font = JFaceResources.getFont( JFaceResources.TEXT_FONT );
+//        sourceViewer.getTextWidget().setFont( font );
 
         // setup document
-        try
-        {
+//        try
+//        {
             editorInput = new NonExistingLdifEditorInput();
             documentProvider = new LdifDocumentProvider();
-            documentProvider.connect( editorInput );
+//            documentProvider.connect( editorInput );
 
-            IDocument document = documentProvider.getDocument( editorInput );
-            document.set( initialLdif );
-            sourceViewer.setDocument( document );
-        }
-        catch ( CoreException e )
-        {
-            e.printStackTrace();
-        }
+//            IDocument document = documentProvider.getDocument( editorInput );
+//            document.set( initialLdif );
+//            sourceViewer.setDocument( document );
+//        }
+//        catch ( CoreException e )
+//        {
+//            e.printStackTrace();
+//        }
 
         // listener
-        sourceViewer.addTextListener( this );
+//        sourceViewer.addTextListener( this );
 
         // focus
-        sourceViewer.getControl().setFocus();
+//        sourceViewer.getControl().setFocus();
     }
 
 
@@ -172,7 +166,7 @@ public class LdifEditorWidget extends Br
      */
     public LdifFile getLdifModel()
     {
-        return documentProvider.getLdifModel();
+        return null;// documentProvider.getLdifModel();
     }
 
 
@@ -188,21 +182,21 @@ public class LdifEditorWidget extends Br
     /**
      * {@inheritDoc}
      */
-    public void textChanged( TextEvent event )
-    {
-        super.notifyListeners();
-    }
-
-
-    /**
-     * Gets the source viewer.
-     * 
-     * @return the source viewer
-     */
-    public SourceViewer getSourceViewer()
-    {
-        return sourceViewer;
-    }
+//    public void textChanged( TextEvent event )
+//    {
+//        super.notifyListeners();
+//    }
+//
+//
+//    /**
+//     * Gets the source viewer.
+//     * 
+//     * @return the source viewer
+//     */
+//    public SourceViewer getSourceViewer()
+//    {
+//        return sourceViewer;
+//    }
 
 
     /**

Modified: directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/address/AddressDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/address/AddressDialog.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/address/AddressDialog.java
(original)
+++ directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/address/AddressDialog.java
Fri Aug 20 17:07:19 2010
@@ -83,8 +83,8 @@ public class AddressDialog extends Dialo
      */
     protected void createButtonsForButtonBar( Composite parent )
     {
-        createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, false );
-        createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL,
false );
+        createButton( parent, IDialogConstants.OK_ID, "OK", false );
+        createButton( parent, IDialogConstants.CANCEL_ID, "Cancel", false );
     }
 
 

Modified: directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/administrativerole/AdministrativeRoleDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/administrativerole/AdministrativeRoleDialog.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/administrativerole/AdministrativeRoleDialog.java
(original)
+++ directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/administrativerole/AdministrativeRoleDialog.java
Fri Aug 20 17:07:19 2010
@@ -123,8 +123,8 @@ public class AdministrativeRoleDialog ex
         administrativeRoleCombo.setVisibleItemCount( 20 );
         administrativeRoleCombo.setItems( administrativeRoleValues );
         administrativeRoleCombo.setText( initialValue );
-        new ExtendedContentAssistCommandAdapter( administrativeRoleCombo, new ComboContentAdapter(),
-            new ListContentProposalProvider( administrativeRoleCombo.getItems() ), null,
null, true );
+//        new ExtendedContentAssistCommandAdapter( administrativeRoleCombo, new ComboContentAdapter(),
+//            new ListContentProposalProvider( administrativeRoleCombo.getItems() ), null,
null, true );
 
         applyDialogFont( composite );
         return composite;

Modified: directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/certificate/CertificateDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/certificate/CertificateDialog.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/certificate/CertificateDialog.java
(original)
+++ directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/certificate/CertificateDialog.java
Fri Aug 20 17:07:19 2010
@@ -22,13 +22,10 @@ package org.apache.directory.studio.valu
 
 
 import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
 import org.apache.directory.studio.connection.ui.ConnectionUIPlugin;
 import org.apache.directory.studio.connection.ui.widgets.CertificateInfoComposite;
@@ -43,7 +40,6 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Shell;
 
 
@@ -103,45 +99,45 @@ public class CertificateDialog extends D
         }
         else if ( buttonId == SAVE_BUTTON_ID )
         {
-            FileDialog fileDialog = new FileDialog( getShell(), SWT.SAVE );
-            fileDialog.setText( Messages.getString( "CertificateDialog.SaveCertificate" )
); //$NON-NLS-1$
-            // fileDialog.setFilterExtensions(new String[]{"*.pem"});
-            String returnedFileName = fileDialog.open();
-            if ( returnedFileName != null )
-            {
-                try
-                {
-                    File file = new File( returnedFileName );
-                    FileUtils.writeByteArrayToFile( file, currentData );
-                }
-                catch ( IOException e )
-                {
-                    ConnectionUIPlugin.getDefault().getExceptionHandler().handleException(
-                        new Status( IStatus.ERROR, ValueEditorsConstants.PLUGIN_ID, IStatus.ERROR,
Messages
-                            .getString( "CertificateDialog.CantWriteToFile" ), e ) ); //$NON-NLS-1$
-                }
-            }
+//            FileDialog fileDialog = new FileDialog( getShell(), SWT.SAVE );
+//            fileDialog.setText( Messages.getString( "CertificateDialog.SaveCertificate"
) ); //$NON-NLS-1$
+//            // fileDialog.setFilterExtensions(new String[]{"*.pem"});
+//            String returnedFileName = fileDialog.open();
+//            if ( returnedFileName != null )
+//            {
+//                try
+//                {
+//                    File file = new File( returnedFileName );
+//                    FileUtils.writeByteArrayToFile( file, currentData );
+//                }
+//                catch ( IOException e )
+//                {
+//                    ConnectionUIPlugin.getDefault().getExceptionHandler().handleException(
+//                        new Status( IStatus.ERROR, ValueEditorsConstants.PLUGIN_ID, IStatus.ERROR,
Messages
+//                            .getString( "CertificateDialog.CantWriteToFile" ), e ) ); //$NON-NLS-1$
+//                }
+//            }
         }
         else if ( buttonId == LOAD_BUTTON_ID )
         {
-            FileDialog fileDialog = new FileDialog( getShell(), SWT.OPEN );
-            fileDialog.setText( Messages.getString( "CertificateDialog.LoadCertificate" )
); //$NON-NLS-1$
-            String returnedFileName = fileDialog.open();
-            if ( returnedFileName != null )
-            {
-                try
-                {
-                    File file = new File( returnedFileName );
-                    currentData = FileUtils.readFileToByteArray( file );
-                    updateInput();
-                }
-                catch ( IOException e )
-                {
-                    ConnectionUIPlugin.getDefault().getExceptionHandler().handleException(
-                        new Status( IStatus.ERROR, ValueEditorsConstants.PLUGIN_ID, IStatus.ERROR,
Messages
-                            .getString( "CertificateDialog.CantReadFile" ), e ) ); //$NON-NLS-1$
-                }
-            }
+//            FileDialog fileDialog = new FileDialog( getShell(), SWT.OPEN );
+//            fileDialog.setText( Messages.getString( "CertificateDialog.LoadCertificate"
) ); //$NON-NLS-1$
+//            String returnedFileName = fileDialog.open();
+//            if ( returnedFileName != null )
+//            {
+//                try
+//                {
+//                    File file = new File( returnedFileName );
+//                    currentData = FileUtils.readFileToByteArray( file );
+//                    updateInput();
+//                }
+//                catch ( IOException e )
+//                {
+//                    ConnectionUIPlugin.getDefault().getExceptionHandler().handleException(
+//                        new Status( IStatus.ERROR, ValueEditorsConstants.PLUGIN_ID, IStatus.ERROR,
Messages
+//                            .getString( "CertificateDialog.CantReadFile" ), e ) ); //$NON-NLS-1$
+//                }
+//            }
         }
         else
         {
@@ -170,8 +166,8 @@ public class CertificateDialog extends D
     {
         createButton( parent, LOAD_BUTTON_ID, Messages.getString( "CertificateDialog.LoadCertificateButton"
), false ); //$NON-NLS-1$
         createButton( parent, SAVE_BUTTON_ID, Messages.getString( "CertificateDialog.SaveCertificateButton"
), false ); //$NON-NLS-1$
-        createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, false );
-        createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL,
false );
+        createButton( parent, IDialogConstants.OK_ID, "OK", false );
+        createButton( parent, IDialogConstants.CANCEL_ID, "Cancel", false );
     }
 
 

Modified: directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/ImageDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/ImageDialog.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/ImageDialog.java
(original)
+++ directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/ImageDialog.java
Fri Aug 20 17:07:19 2010
@@ -26,15 +26,11 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 
 import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
-import org.apache.directory.studio.connection.ui.ConnectionUIPlugin;
 import org.apache.directory.studio.valueeditors.ValueEditorsActivator;
 import org.apache.directory.studio.valueeditors.ValueEditorsConstants;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.osgi.util.NLS;
@@ -52,7 +48,6 @@ import org.eclipse.swt.layout.GridLayout
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.TabFolder;
@@ -227,8 +222,8 @@ public class ImageDialog extends Dialog
      */
     protected void createButtonsForButtonBar( Composite parent )
     {
-        okButton = createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
false );
-        createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL,
false );
+        okButton = createButton( parent, IDialogConstants.OK_ID, "OK", false );
+        createButton( parent, IDialogConstants.CANCEL_ID, "IDialogConstants.CANCEL_LABEL",
false );
 
         // load dialog settings
         try
@@ -304,35 +299,35 @@ public class ImageDialog extends Dialog
             {
                 public void widgetSelected( SelectionEvent event )
                 {
-                    FileDialog fileDialog = new FileDialog( ImageDialog.this.getShell(),
SWT.SAVE );
-                    fileDialog.setText( Messages.getString( "ImageDialog.SaveImage" ) );
//$NON-NLS-1$
-                    fileDialog.setFilterExtensions( new String[]
-                        { "*.jpg" } ); //$NON-NLS-1$
-                    String returnedFileName = fileDialog.open();
-                    if ( returnedFileName != null )
-                    {
-                        try
-                        {
-                            File file = new File( returnedFileName );
-                            FileOutputStream out = new FileOutputStream( file );
-                            out.write( currentImageRawData );
-                            out.flush();
-                            out.close();
-                        }
-                        catch ( FileNotFoundException e )
-                        {
-
-                            ConnectionUIPlugin.getDefault().getExceptionHandler().handleException(
-                                new Status( IStatus.ERROR, ValueEditorsConstants.PLUGIN_ID,
IStatus.ERROR, Messages
-                                    .getString( "ImageDialog.CantWriteFile" ), e ) ); //$NON-NLS-1$
-                        }
-                        catch ( IOException e )
-                        {
-                            ConnectionUIPlugin.getDefault().getExceptionHandler().handleException(
-                                new Status( IStatus.ERROR, ValueEditorsConstants.PLUGIN_ID,
IStatus.ERROR, Messages
-                                    .getString( "ImageDialog.CantWriteFile" ), e ) ); //$NON-NLS-1$
-                        }
-                    }
+//                    FileDialog fileDialog = new FileDialog( ImageDialog.this.getShell(),
SWT.SAVE );
+//                    fileDialog.setText( Messages.getString( "ImageDialog.SaveImage" ) );
//$NON-NLS-1$
+//                    fileDialog.setFilterExtensions( new String[]
+//                        { "*.jpg" } ); //$NON-NLS-1$
+//                    String returnedFileName = fileDialog.open();
+//                    if ( returnedFileName != null )
+//                    {
+//                        try
+//                        {
+//                            File file = new File( returnedFileName );
+//                            FileOutputStream out = new FileOutputStream( file );
+//                            out.write( currentImageRawData );
+//                            out.flush();
+//                            out.close();
+//                        }
+//                        catch ( FileNotFoundException e )
+//                        {
+//
+//                            ConnectionUIPlugin.getDefault().getExceptionHandler().handleException(
+//                                new Status( IStatus.ERROR, ValueEditorsConstants.PLUGIN_ID,
IStatus.ERROR, Messages
+//                                    .getString( "ImageDialog.CantWriteFile" ), e ) ); //$NON-NLS-1$
+//                        }
+//                        catch ( IOException e )
+//                        {
+//                            ConnectionUIPlugin.getDefault().getExceptionHandler().handleException(
+//                                new Status( IStatus.ERROR, ValueEditorsConstants.PLUGIN_ID,
IStatus.ERROR, Messages
+//                                    .getString( "ImageDialog.CantWriteFile" ), e ) ); //$NON-NLS-1$
+//                        }
+//                    }
                 }
             } );
 
@@ -375,16 +370,16 @@ public class ImageDialog extends Dialog
         {
             public void widgetSelected( SelectionEvent event )
             {
-                FileDialog fileDialog = new FileDialog( ImageDialog.this.getShell(), SWT.OPEN
);
-                fileDialog.setText( Messages.getString( "ImageDialog.SelectImage" ) ); //$NON-NLS-1$
-                // fileDialog.setFilterExtensions(IMAGE_FILE_EXTENSIONS);
-                fileDialog.setFileName( new File( newImageFilenameText.getText() ).getName()
);
-                fileDialog.setFilterPath( new File( newImageFilenameText.getText() ).getParent()
);
-                String returnedFileName = fileDialog.open();
-                if ( returnedFileName != null )
-                {
-                    newImageFilenameText.setText( returnedFileName );
-                }
+//                FileDialog fileDialog = new FileDialog( ImageDialog.this.getShell(), SWT.OPEN
);
+//                fileDialog.setText( Messages.getString( "ImageDialog.SelectImage" ) );
//$NON-NLS-1$
+//                // fileDialog.setFilterExtensions(IMAGE_FILE_EXTENSIONS);
+//                fileDialog.setFileName( new File( newImageFilenameText.getText() ).getName()
);
+//                fileDialog.setFilterPath( new File( newImageFilenameText.getText() ).getParent()
);
+//                String returnedFileName = fileDialog.open();
+//                if ( returnedFileName != null )
+//                {
+//                    newImageFilenameText.setText( returnedFileName );
+//                }
             }
         } );
 

Modified: directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/integer/IntegerDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/integer/IntegerDialog.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/integer/IntegerDialog.java
(original)
+++ directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/integer/IntegerDialog.java
Fri Aug 20 17:07:19 2010
@@ -83,8 +83,8 @@ public class IntegerDialog extends Dialo
      */
     protected void createButtonsForButtonBar( Composite parent )
     {
-        createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true );
-        createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL,
false );
+        createButton( parent, IDialogConstants.OK_ID, "OK", true );
+        createButton( parent, IDialogConstants.CANCEL_ID, "Cancel", false );
     }
 
 

Modified: directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassDialog.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassDialog.java
(original)
+++ directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassDialog.java
Fri Aug 20 17:07:19 2010
@@ -129,8 +129,7 @@ public class ObjectClassDialog extends D
         objectClassCombo.setVisibleItemCount( 20 );
         objectClassCombo.setItems( allOcNames );
         objectClassCombo.setText( initialValue );
-        new ExtendedContentAssistCommandAdapter( objectClassCombo, new ComboContentAdapter(),
-            new ListContentProposalProvider( objectClassCombo.getItems() ), null, null, true
);
+        
 
         applyDialogFont( composite );
         return composite;

Modified: directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordDialog.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordDialog.java
(original)
+++ directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordDialog.java
Fri Aug 20 17:07:19 2010
@@ -212,8 +212,8 @@ public class PasswordDialog extends Dial
      */
     protected void createButtonsForButtonBar( Composite parent )
     {
-        okButton = createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
false );
-        createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL,
false );
+        okButton = createButton( parent, IDialogConstants.OK_ID, "Ok", false );
+        createButton( parent, IDialogConstants.CANCEL_ID, "Cancel", false );
 
         // load dialog settings
         try
@@ -505,7 +505,7 @@ public class PasswordDialog extends Dial
                     getShell(),
                     Messages.getString( "PasswordDialog.PasswordVerification" ), getShell().getImage(),
//$NON-NLS-1$
                     Messages.getString( "PasswordDialog.PasswordVerifiedSuccessfully" ),
MessageDialog.INFORMATION, new String[] //$NON-NLS-1$
-                        { IDialogConstants.OK_LABEL }, 0 );
+                        { "OK" }, 0 );
                 dialog.open();
             }
             else
@@ -514,7 +514,7 @@ public class PasswordDialog extends Dial
                     getShell(),
                     Messages.getString( "PasswordDialog.PasswordVerification" ), getShell().getImage(),
//$NON-NLS-1$
                     Messages.getString( "PasswordDialog.PasswordVerificationFailed" ), MessageDialog.ERROR,
new String[] //$NON-NLS-1$
-                        { IDialogConstants.OK_LABEL }, 0 );
+                        { "Cancel" }, 0 );
                 dialog.open();
             }
         }

Modified: directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/GeneralizedTimeValueDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/GeneralizedTimeValueDialog.java?rev=987577&r1=987576&r2=987577&view=diff
==============================================================================
--- directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/GeneralizedTimeValueDialog.java
(original)
+++ directory/studio/branches/studio-rap/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/GeneralizedTimeValueDialog.java
Fri Aug 20 17:07:19 2010
@@ -244,8 +244,8 @@ public class GeneralizedTimeValueDialog 
      */
     protected void createButtonsForButtonBar( Composite parent )
     {
-        okButton = createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
true );
-        createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL,
false );
+        okButton = createButton( parent, IDialogConstants.OK_ID, "Ok", true );
+        createButton( parent, IDialogConstants.CANCEL_ID, "Cancel", false );
     }
 
 



Mime
View raw message