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/04/14 22:19:25 UTC
svn commit: r528867 [2/2] - in /directory/ldapstudio/trunk:
ldapstudio-browser-common/src/main/java/org/apache/directory/ldapstudio/browser/common/widgets/browser/
ldapstudio-browser-common/src/main/java/org/apache/directory/ldapstudio/browser/common/w...
Modified: directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Connection.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Connection.java?view=diff&rev=528867&r1=528866&r2=528867
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Connection.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Connection.java Sat Apr 14 13:19:23 2007
@@ -347,7 +347,7 @@
}
EventRegistry.fireConnectionUpdated( new ConnectionUpdateEvent( this,
- ConnectionUpdateEvent.CONNECTION_OPENED ), this );
+ ConnectionUpdateEvent.EventDetail.CONNECTION_OPENED ), this );
}
}
@@ -401,7 +401,7 @@
searchHandler.connectionClosed();
EventRegistry.fireConnectionUpdated( new ConnectionUpdateEvent( this,
- ConnectionUpdateEvent.CONNECTION_CLOSED ), this );
+ ConnectionUpdateEvent.EventDetail.CONNECTION_CLOSED ), this );
System.gc();
}
}
@@ -561,7 +561,7 @@
this.schema = new Schema();
this.schema.loadFromRecord( schemaRecord );
EventRegistry.fireConnectionUpdated( new ConnectionUpdateEvent( this,
- ConnectionUpdateEvent.CONNECTION_SCHEMA_LOADED ), this );
+ ConnectionUpdateEvent.EventDetail.SCHEMA_LOADED ), this );
}
else
{
@@ -682,7 +682,7 @@
{
this.connectionParameter.setFetchBaseDNs( fetchBaseDNs );
EventRegistry.fireConnectionUpdated( new ConnectionUpdateEvent( this,
- ConnectionUpdateEvent.CONNECTION_PARAMETER_UPDATED ), this );
+ ConnectionUpdateEvent.EventDetail.CONNECTION_PARAMETER_UPDATED ), this );
}
@@ -696,7 +696,7 @@
{
this.connectionParameter.setBaseDN( baseDN );
EventRegistry.fireConnectionUpdated( new ConnectionUpdateEvent( this,
- ConnectionUpdateEvent.CONNECTION_PARAMETER_UPDATED ), this );
+ ConnectionUpdateEvent.EventDetail.CONNECTION_PARAMETER_UPDATED ), this );
}
@@ -710,7 +710,7 @@
{
this.connectionParameter.setCountLimit( countLimit );
EventRegistry.fireConnectionUpdated( new ConnectionUpdateEvent( this,
- ConnectionUpdateEvent.CONNECTION_PARAMETER_UPDATED ), this );
+ ConnectionUpdateEvent.EventDetail.CONNECTION_PARAMETER_UPDATED ), this );
}
@@ -724,7 +724,7 @@
{
this.connectionParameter.setHost( host );
EventRegistry.fireConnectionUpdated( new ConnectionUpdateEvent( this,
- ConnectionUpdateEvent.CONNECTION_PARAMETER_UPDATED ), this );
+ ConnectionUpdateEvent.EventDetail.CONNECTION_PARAMETER_UPDATED ), this );
}
@@ -738,7 +738,7 @@
{
this.connectionParameter.setPort( port );
EventRegistry.fireConnectionUpdated( new ConnectionUpdateEvent( this,
- ConnectionUpdateEvent.CONNECTION_PARAMETER_UPDATED ), this );
+ ConnectionUpdateEvent.EventDetail.CONNECTION_PARAMETER_UPDATED ), this );
}
@@ -752,7 +752,7 @@
{
this.connectionParameter.setAliasesDereferencingMethod( aliasesDereferencingMethod );
EventRegistry.fireConnectionUpdated( new ConnectionUpdateEvent( this,
- ConnectionUpdateEvent.CONNECTION_PARAMETER_UPDATED ), this );
+ ConnectionUpdateEvent.EventDetail.CONNECTION_PARAMETER_UPDATED ), this );
}
@@ -766,7 +766,7 @@
{
this.connectionParameter.setReferralsHandlingMethod( referralsHandlingMethod );
EventRegistry.fireConnectionUpdated( new ConnectionUpdateEvent( this,
- ConnectionUpdateEvent.CONNECTION_PARAMETER_UPDATED ), this );
+ ConnectionUpdateEvent.EventDetail.CONNECTION_PARAMETER_UPDATED ), this );
}
@@ -780,7 +780,7 @@
{
this.connectionParameter.setEncryptionMethod( encryptionMethod );
EventRegistry.fireConnectionUpdated( new ConnectionUpdateEvent( this,
- ConnectionUpdateEvent.CONNECTION_PARAMETER_UPDATED ), this );
+ ConnectionUpdateEvent.EventDetail.CONNECTION_PARAMETER_UPDATED ), this );
}
@@ -794,7 +794,7 @@
{
this.connectionParameter.setTimeLimit( timeLimit );
EventRegistry.fireConnectionUpdated( new ConnectionUpdateEvent( this,
- ConnectionUpdateEvent.CONNECTION_PARAMETER_UPDATED ), this );
+ ConnectionUpdateEvent.EventDetail.CONNECTION_PARAMETER_UPDATED ), this );
}
@@ -808,7 +808,7 @@
{
this.connectionParameter.setBindPrincipal( bindPrincipal );
EventRegistry.fireConnectionUpdated( new ConnectionUpdateEvent( this,
- ConnectionUpdateEvent.CONNECTION_PARAMETER_UPDATED ), this );
+ ConnectionUpdateEvent.EventDetail.CONNECTION_PARAMETER_UPDATED ), this );
}
@@ -822,7 +822,7 @@
{
this.connectionParameter.setBindPassword( bindPassword );
EventRegistry.fireConnectionUpdated( new ConnectionUpdateEvent( this,
- ConnectionUpdateEvent.CONNECTION_PARAMETER_UPDATED ), this );
+ ConnectionUpdateEvent.EventDetail.CONNECTION_PARAMETER_UPDATED ), this );
}
@@ -836,7 +836,7 @@
{
this.connectionParameter.setAuthMethod( authMethod );
EventRegistry.fireConnectionUpdated( new ConnectionUpdateEvent( this,
- ConnectionUpdateEvent.CONNECTION_PARAMETER_UPDATED ), this );
+ ConnectionUpdateEvent.EventDetail.CONNECTION_PARAMETER_UPDATED ), this );
}
@@ -850,7 +850,7 @@
{
this.connectionParameter.setConnectionProviderClassName( connectionProviderClassName );
EventRegistry.fireConnectionUpdated( new ConnectionUpdateEvent( this,
- ConnectionUpdateEvent.CONNECTION_PARAMETER_UPDATED ), this );
+ ConnectionUpdateEvent.EventDetail.CONNECTION_PARAMETER_UPDATED ), this );
}
Modified: directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/DelegateEntry.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/DelegateEntry.java?view=diff&rev=528867&r1=528866&r2=528867
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/DelegateEntry.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/DelegateEntry.java Sat Apr 14 13:19:23 2007
@@ -446,14 +446,14 @@
if ( event instanceof AttributeAddedEvent )
{
AttributeAddedEvent e = ( AttributeAddedEvent ) event;
- AttributeAddedEvent delegateEvent = new AttributeAddedEvent( e.getOriginalConnection(), this, e
+ AttributeAddedEvent delegateEvent = new AttributeAddedEvent( e.getConnection(), this, e
.getAddedAttribute() );
EventRegistry.fireEntryUpdated( delegateEvent, this );
}
else if ( event instanceof AttributeDeletedEvent )
{
AttributeDeletedEvent e = ( AttributeDeletedEvent ) event;
- AttributeDeletedEvent delegateEvent = new AttributeDeletedEvent( e.getOriginalConnection(), this, e
+ AttributeDeletedEvent delegateEvent = new AttributeDeletedEvent( e.getConnection(), this, e
.getDeletedAttribute() );
EventRegistry.fireEntryUpdated( delegateEvent, this );
}
@@ -466,14 +466,14 @@
else if ( event instanceof EmptyValueAddedEvent )
{
EmptyValueAddedEvent e = ( EmptyValueAddedEvent ) event;
- EmptyValueAddedEvent delegateEvent = new EmptyValueAddedEvent( e.getOriginalConnection(), this, e
+ EmptyValueAddedEvent delegateEvent = new EmptyValueAddedEvent( e.getConnection(), this, e
.getModifiedAttribute(), e.getAddedValue() );
EventRegistry.fireEntryUpdated( delegateEvent, this );
}
else if ( event instanceof EmptyValueDeletedEvent )
{
EmptyValueDeletedEvent e = ( EmptyValueDeletedEvent ) event;
- EmptyValueDeletedEvent delegateEvent = new EmptyValueDeletedEvent( e.getOriginalConnection(), this, e
+ EmptyValueDeletedEvent delegateEvent = new EmptyValueDeletedEvent( e.getConnection(), this, e
.getModifiedAttribute(), e.getDeletedValue() );
EventRegistry.fireEntryUpdated( delegateEvent, this );
}
@@ -490,28 +490,28 @@
else if ( event instanceof ValueAddedEvent )
{
ValueAddedEvent e = ( ValueAddedEvent ) event;
- ValueAddedEvent delegateEvent = new ValueAddedEvent( e.getOriginalConnection(), this, e
+ ValueAddedEvent delegateEvent = new ValueAddedEvent( e.getConnection(), this, e
.getModifiedAttribute(), e.getAddedValue() );
EventRegistry.fireEntryUpdated( delegateEvent, this );
}
else if ( event instanceof ValueDeletedEvent )
{
ValueDeletedEvent e = ( ValueDeletedEvent ) event;
- ValueDeletedEvent delegateEvent = new ValueDeletedEvent( e.getOriginalConnection(), this, e
+ ValueDeletedEvent delegateEvent = new ValueDeletedEvent( e.getConnection(), this, e
.getModifiedAttribute(), e.getDeletedValue() );
EventRegistry.fireEntryUpdated( delegateEvent, this );
}
else if ( event instanceof ValueModifiedEvent )
{
ValueModifiedEvent e = ( ValueModifiedEvent ) event;
- ValueModifiedEvent delegateEvent = new ValueModifiedEvent( e.getOriginalConnection(), this, e
+ ValueModifiedEvent delegateEvent = new ValueModifiedEvent( e.getConnection(), this, e
.getModifiedAttribute(), e.getOldValue(), e.getNewValue() );
EventRegistry.fireEntryUpdated( delegateEvent, this );
}
else if ( event instanceof ValueRenamedEvent )
{
ValueRenamedEvent e = ( ValueRenamedEvent ) event;
- ValueRenamedEvent delegateEvent = new ValueRenamedEvent( e.getOriginalConnection(), this, e
+ ValueRenamedEvent delegateEvent = new ValueRenamedEvent( e.getConnection(), this, e
.getOldValue(), e.getNewValue() );
EventRegistry.fireEntryUpdated( delegateEvent, this );
}
Modified: directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Search.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Search.java?view=diff&rev=528867&r1=528866&r2=528867
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Search.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/Search.java Sat Apr 14 13:19:23 2007
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.ldapstudio.browser.core.internal.model;
@@ -77,14 +77,14 @@
* <li>ignore referrals
* <li>no initialization of hasChildren flag
* <li>no initialization of isAlias and isReferral flag
- * <li>no controls
+ * <li>no controls
* <li>
* </ul>
*/
public Search()
{
this(
- new SimpleDateFormat( "yyyy-MM-dd HH-mm-ss" ).format( new Date() ), //$NON-NLS-1$
+ new SimpleDateFormat( "yyyy-MM-dd HH-mm-ss" ).format( new Date() ), //$NON-NLS-1$
null, EMPTY_SEARCH_BASE, FILTER_TRUE, NO_ATTRIBUTES, ISearch.SCOPE_ONELEVEL, 0, 0,
IConnection.DEREFERENCE_ALIASES_NEVER, IConnection.HANDLE_REFERRALS_IGNORE, false, false, null );
}
@@ -107,7 +107,7 @@
/**
* Creates a new search with the given search parameters
- *
+ *
* @param searchName
* the name of the search
* @param conn
@@ -129,12 +129,12 @@
* @param timeLimit
* the time limit in ms, 0 indicates no limit
* @param aliasesDereferencingMethod
- * the aliases dereferencing method, one of IConnection.DEREFERENCE_ALIASES_NEVER,
+ * the aliases dereferencing method, one of IConnection.DEREFERENCE_ALIASES_NEVER,
* IConnection.DEREFERENCE_ALIASES_ALWAYS, IConnection.DEREFERENCE_ALIASES_FINDING
* or IConnection.DEREFERENCE_ALIASES_SEARCH
* @param referralsHandlingMethod
- * the referrals handling method, one of IConnection.HANDLE_REFERRALS_IGNORE
- * or IConnection.HANDLE_REFERRALS_FOLLOW
+ * the referrals handling method, one of IConnection.HANDLE_REFERRALS_IGNORE
+ * or IConnection.HANDLE_REFERRALS_FOLLOW
* @param initHasChildrenFlag
* the init hasChildren flag
* @param initAliasAndReferralsFlag
@@ -178,7 +178,7 @@
*
* @param detail the SearchUpdateEvent detail
*/
- private void fireSearchUpdated( int detail )
+ private void fireSearchUpdated( SearchUpdateEvent.EventDetail detail )
{
if ( this.getName() != null && !"".equals( this.getName() ) ) { //$NON-NLS-1$
EventRegistry.fireSearchUpdated( new SearchUpdateEvent( this, detail ), this );
@@ -228,7 +228,7 @@
public void setCountLimit( int countLimit )
{
this.searchParameter.setCountLimit( countLimit );
- this.fireSearchUpdated( SearchUpdateEvent.SEARCH_PARAMETER_UPDATED );
+ this.fireSearchUpdated( SearchUpdateEvent.EventDetail.SEARCH_PARAMETER_UPDATED );
}
@@ -247,7 +247,7 @@
public void setFilter( String filter )
{
this.searchParameter.setFilter( filter );
- this.fireSearchUpdated( SearchUpdateEvent.SEARCH_PARAMETER_UPDATED );
+ this.fireSearchUpdated( SearchUpdateEvent.EventDetail.SEARCH_PARAMETER_UPDATED );
}
@@ -266,7 +266,7 @@
public void setReturningAttributes( String[] returningAttributes )
{
this.searchParameter.setReturningAttributes( returningAttributes );
- this.fireSearchUpdated( SearchUpdateEvent.SEARCH_PARAMETER_UPDATED );
+ this.fireSearchUpdated( SearchUpdateEvent.EventDetail.SEARCH_PARAMETER_UPDATED );
}
@@ -285,7 +285,7 @@
public void setScope( int scope )
{
this.searchParameter.setScope( scope );
- this.fireSearchUpdated( SearchUpdateEvent.SEARCH_PARAMETER_UPDATED );
+ this.fireSearchUpdated( SearchUpdateEvent.EventDetail.SEARCH_PARAMETER_UPDATED );
}
@@ -304,7 +304,7 @@
public void setAliasesDereferencingMethod( int aliasesDereferencingMethod )
{
this.searchParameter.setAliasesDereferencingMethod( aliasesDereferencingMethod );
- this.fireSearchUpdated( SearchUpdateEvent.SEARCH_PARAMETER_UPDATED );
+ this.fireSearchUpdated( SearchUpdateEvent.EventDetail.SEARCH_PARAMETER_UPDATED );
}
@@ -323,7 +323,7 @@
public void setReferralsHandlingMethod( int referralsHandlingMethod )
{
this.searchParameter.setReferralsHandlingMethod( referralsHandlingMethod );
- this.fireSearchUpdated( SearchUpdateEvent.SEARCH_PARAMETER_UPDATED );
+ this.fireSearchUpdated( SearchUpdateEvent.EventDetail.SEARCH_PARAMETER_UPDATED );
}
@@ -342,7 +342,7 @@
public void setSearchBase( DN searchBase )
{
this.searchParameter.setSearchBase( searchBase );
- this.fireSearchUpdated( SearchUpdateEvent.SEARCH_PARAMETER_UPDATED );
+ this.fireSearchUpdated( SearchUpdateEvent.EventDetail.SEARCH_PARAMETER_UPDATED );
}
@@ -361,7 +361,7 @@
public void setTimeLimit( int timeLimit )
{
this.searchParameter.setTimeLimit( timeLimit );
- this.fireSearchUpdated( SearchUpdateEvent.SEARCH_PARAMETER_UPDATED );
+ this.fireSearchUpdated( SearchUpdateEvent.EventDetail.SEARCH_PARAMETER_UPDATED );
}
@@ -380,7 +380,7 @@
public void setName( String searchName )
{
this.searchParameter.setName( searchName );
- this.fireSearchUpdated( SearchUpdateEvent.SEARCH_RENAMED );
+ this.fireSearchUpdated( SearchUpdateEvent.EventDetail.SEARCH_RENAMED );
}
@@ -401,7 +401,7 @@
this.searchResults = searchResults;
if ( searchResults != null )
{
- this.fireSearchUpdated( SearchUpdateEvent.SEARCH_PERFORMED );
+ this.fireSearchUpdated( SearchUpdateEvent.EventDetail.SEARCH_PERFORMED );
}
}
@@ -421,7 +421,7 @@
public void setCountLimitExceeded( boolean countLimitExceeded )
{
this.countLimitExceeded = countLimitExceeded;
- this.fireSearchUpdated( SearchUpdateEvent.SEARCH_PERFORMED );
+ this.fireSearchUpdated( SearchUpdateEvent.EventDetail.SEARCH_PERFORMED );
}
@@ -444,7 +444,7 @@
this.searchParameter.setTimeLimit( connection.getTimeLimit() );
this.searchParameter.setAliasesDereferencingMethod( connection.getAliasesDereferencingMethod() );
this.searchParameter.setReferralsHandlingMethod( connection.getReferralsHandlingMethod() );
- this.fireSearchUpdated( SearchUpdateEvent.SEARCH_PARAMETER_UPDATED );
+ this.fireSearchUpdated( SearchUpdateEvent.EventDetail.SEARCH_PARAMETER_UPDATED );
}
Modified: directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/DeleteEntriesJob.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/DeleteEntriesJob.java?view=diff&rev=528867&r1=528866&r2=528867
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/DeleteEntriesJob.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/DeleteEntriesJob.java Sat Apr 14 13:19:23 2007
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.ldapstudio.browser.core.jobs;
@@ -48,7 +48,7 @@
private IEntry[] entriesToDelete;
private Set deletedEntriesSet = new HashSet();
-
+
private Set entriesToUpdateSet = new HashSet();
private Set searchesToUpdateSet = new HashSet();
@@ -234,7 +234,7 @@
for ( Iterator it = searchesToUpdateSet.iterator(); it.hasNext(); )
{
ISearch search = ( ISearch ) it.next();
- EventRegistry.fireSearchUpdated( new SearchUpdateEvent( search, SearchUpdateEvent.SEARCH_PERFORMED ), this );
+ EventRegistry.fireSearchUpdated( new SearchUpdateEvent( search, SearchUpdateEvent.EventDetail.SEARCH_PERFORMED ), this );
}
}
Modified: directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/MoveEntriesJob.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/MoveEntriesJob.java?view=diff&rev=528867&r1=528866&r2=528867
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/MoveEntriesJob.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/MoveEntriesJob.java Sat Apr 14 13:19:23 2007
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.ldapstudio.browser.core.jobs;
@@ -166,7 +166,7 @@
for ( Iterator it = searchesToUpdateSet.iterator(); it.hasNext(); )
{
ISearch search = ( ISearch ) it.next();
- EventRegistry.fireSearchUpdated( new SearchUpdateEvent( search, SearchUpdateEvent.SEARCH_PERFORMED ), this );
+ EventRegistry.fireSearchUpdated( new SearchUpdateEvent( search, SearchUpdateEvent.EventDetail.SEARCH_PERFORMED ), this );
}
}
Modified: directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/OpenConnectionsJob.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/OpenConnectionsJob.java?view=diff&rev=528867&r1=528866&r2=528867
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/OpenConnectionsJob.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/OpenConnectionsJob.java Sat Apr 14 13:19:23 2007
@@ -102,12 +102,12 @@
if ( connections[i].isOpened() )
{
EventRegistry.fireConnectionUpdated( new ConnectionUpdateEvent( connections[i],
- ConnectionUpdateEvent.CONNECTION_OPENED ), this );
+ ConnectionUpdateEvent.EventDetail.CONNECTION_OPENED ), this );
}
else
{
EventRegistry.fireConnectionUpdated( new ConnectionUpdateEvent( connections[i],
- ConnectionUpdateEvent.CONNECTION_CLOSED ), this );
+ ConnectionUpdateEvent.EventDetail.CONNECTION_CLOSED ), this );
}
}
}
Modified: directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/ReloadSchemasJob.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/ReloadSchemasJob.java?view=diff&rev=528867&r1=528866&r2=528867
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/ReloadSchemasJob.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/ReloadSchemasJob.java Sat Apr 14 13:19:23 2007
@@ -85,7 +85,7 @@
for ( int i = 0; i < connections.length; i++ )
{
EventRegistry.fireConnectionUpdated( new ConnectionUpdateEvent( connections[i],
- ConnectionUpdateEvent.CONNECTION_SCHEMA_LOADED ), this );
+ ConnectionUpdateEvent.EventDetail.SCHEMA_LOADED ), this );
}
}
Modified: directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/RenameEntryJob.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/RenameEntryJob.java?view=diff&rev=528867&r1=528866&r2=528867
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/RenameEntryJob.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/RenameEntryJob.java Sat Apr 14 13:19:23 2007
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.ldapstudio.browser.core.jobs;
@@ -149,7 +149,7 @@
for ( Iterator it = searchesToUpdateSet.iterator(); it.hasNext(); )
{
ISearch search = ( ISearch ) it.next();
- EventRegistry.fireSearchUpdated( new SearchUpdateEvent( search, SearchUpdateEvent.SEARCH_PERFORMED ), this );
+ EventRegistry.fireSearchUpdated( new SearchUpdateEvent( search, SearchUpdateEvent.EventDetail.SEARCH_PERFORMED ), this );
}
}
Modified: directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/SearchJob.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/SearchJob.java?view=diff&rev=528867&r1=528866&r2=528867
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/SearchJob.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/SearchJob.java Sat Apr 14 13:19:23 2007
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.ldapstudio.browser.core.jobs;
@@ -100,7 +100,7 @@
{
for ( int pi = 0; pi < searches.length; pi++ )
{
- EventRegistry.fireSearchUpdated( new SearchUpdateEvent( searches[pi], SearchUpdateEvent.SEARCH_PERFORMED ),
+ EventRegistry.fireSearchUpdated( new SearchUpdateEvent( searches[pi], SearchUpdateEvent.EventDetail.SEARCH_PERFORMED ),
this );
}
}
Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/SearchPropertyPage.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/SearchPropertyPage.java?view=diff&rev=528867&r1=528866&r2=528867
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/SearchPropertyPage.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/dialogs/properties/SearchPropertyPage.java Sat Apr 14 13:19:23 2007
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.ldapstudio.browser.ui.dialogs.properties;
@@ -93,7 +93,7 @@
{
// send update event to force saving of new search parameters.
EventRegistry.fireSearchUpdated( new SearchUpdateEvent( this.search,
- SearchUpdateEvent.SEARCH_PARAMETER_UPDATED ), this );
+ SearchUpdateEvent.EventDetail.SEARCH_PARAMETER_UPDATED ), this );
return this.spw.performSearch( this.search );
}
Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserViewUniversalListener.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserViewUniversalListener.java?view=diff&rev=528867&r1=528866&r2=528867
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserViewUniversalListener.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/browser/BrowserViewUniversalListener.java Sat Apr 14 13:19:23 2007
@@ -397,7 +397,7 @@
*/
public void connectionUpdated( ConnectionUpdateEvent connectionUpdateEvent )
{
- if ( connectionUpdateEvent.getDetail() == ConnectionUpdateEvent.CONNECTION_OPENED )
+ if ( connectionUpdateEvent.getDetail() == ConnectionUpdateEvent.EventDetail.CONNECTION_OPENED )
{
// expand viewer
viewer.refresh( connectionUpdateEvent.getConnection() );
@@ -413,7 +413,7 @@
viewer.expandToLevel( rootDSE, 2 );
}
}
- else if ( connectionUpdateEvent.getDetail() == ConnectionUpdateEvent.CONNECTION_CLOSED )
+ else if ( connectionUpdateEvent.getDetail() == ConnectionUpdateEvent.EventDetail.CONNECTION_CLOSED )
{
viewer.collapseAll();
connectionToExpandedElementsMap.remove( connectionUpdateEvent.getConnection() );
Modified: directory/ldapstudio/trunk/ldapstudio-ldifeditor/src/main/java/org/apache/directory/ldapstudio/ldifeditor/editor/LdifEditor.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-ldifeditor/src/main/java/org/apache/directory/ldapstudio/ldifeditor/editor/LdifEditor.java?view=diff&rev=528867&r1=528866&r2=528867
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-ldifeditor/src/main/java/org/apache/directory/ldapstudio/ldifeditor/editor/LdifEditor.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-ldifeditor/src/main/java/org/apache/directory/ldapstudio/ldifeditor/editor/LdifEditor.java Sat Apr 14 13:19:23 2007
@@ -33,8 +33,8 @@
import org.apache.directory.ldapstudio.browser.core.events.EventRegistry;
import org.apache.directory.ldapstudio.browser.core.model.IConnection;
import org.apache.directory.ldapstudio.browser.core.model.ldif.LdifFile;
-import org.apache.directory.ldapstudio.ldifeditor.LdifEditorConstants;
import org.apache.directory.ldapstudio.ldifeditor.LdifEditorActivator;
+import org.apache.directory.ldapstudio.ldifeditor.LdifEditorConstants;
import org.apache.directory.ldapstudio.ldifeditor.editor.actions.EditLdifAttributeAction;
import org.apache.directory.ldapstudio.ldifeditor.editor.actions.EditLdifRecordAction;
import org.apache.directory.ldapstudio.ldifeditor.editor.actions.FormatLdifDocumentAction;
@@ -469,7 +469,7 @@
// GridData(GridData.GRAB_HORIZONTAL));
connectionCombo = BaseWidgetUtils.createReadonlyCombo( connectionComboControl, new String[0], 0, 1 );
connectionCombo.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, true ) );
- connectionUpdated( new ConnectionUpdateEvent( null, 0 ) );
+ connectionUpdated( null );
connectionCombo.addModifyListener( new ModifyListener()
{
public void modifyText( ModifyEvent e )