You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2006/12/06 14:17:46 UTC
svn commit: r483066 [1/10] - in
/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src:
main/java/org/apache/directory/ldapstudio/dsmlv2/
main/java/org/apache/directory/ldapstudio/dsmlv2/engine/
main/java/org/apache/directory/ldapstudio/ds...
Author: pamarcelot
Date: Wed Dec 6 05:17:42 2006
New Revision: 483066
URL: http://svn.apache.org/viewvc?view=rev&rev=483066
Log:
Resolving issue DIRSTUDIO-14. The parser now works perfectly if a value is empty (<value></value>). A source formating has also been done to match code template requirements.
Added:
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/abandonRequest/request_with_1_control_empty_value.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/addRequest/request_with_1_attr_empty_value.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/addRequest/request_with_1_control_empty_value.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/authRequest/request_with_1_control_empty_value.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/compareRequest/request_with_1_assertion_empty_value.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/compareRequest/request_with_1_control_empty_value.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/delRequest/request_with_1_control_empty_value.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/extendedRequest/request_with_1_control_empty_value.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/extendedRequest/request_with_empty_requestName.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/extendedRequest/request_with_empty_requestValue.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/modDNRequest/request_with_1_control_empty_value.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/modifyRequest/request_with_1_control_empty_value.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/modifyRequest/request_with_modification_with_empty_value.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/searchRequest/filters/request_with_approxMatch_with_empty_value.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/searchRequest/filters/request_with_equalityMatch_with_empty_value.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/searchRequest/filters/request_with_extensibleMatch_with_empty_value.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/searchRequest/filters/request_with_greaterOrEqual_with_empty_value.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/searchRequest/filters/request_with_lessOrEqual_with_empty_value.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/searchRequest/filters/request_with_substrings_1_empty_any.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/searchRequest/filters/request_with_substrings_1_empty_final.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/searchRequest/filters/request_with_substrings_1_empty_initial.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/searchRequest/request_with_1_control_empty_value.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/searchRequest/request_with_subentries_control.xml
Removed:
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Main.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/ResponseMain.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/engine/MainEngine.java
Modified:
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/AbstractGrammar.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/BatchRequest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/BatchResponse.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Container.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Dsmlv2Container.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Dsmlv2Grammar.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Dsmlv2Parser.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Dsmlv2ResponseGrammar.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Dsmlv2ResponseParser.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Dsmlv2StatesEnum.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/GrammarAction.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/GrammarTransition.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/IAction.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/IGrammar.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/IStates.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Tag.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/engine/Dsmlv2Engine.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/reponse/ErrorResponse.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/reponse/LdapMessageDecorator.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/reponse/SearchResponse.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/AbstractResponseTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/AbstractTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/AllTests.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/abandonRequest/AbandonRequestTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/addRequest/AddRequestTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/addResponse/AddResponseTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/authRequest/AuthRequestTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/authResponse/AuthResponseTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/batchRequest/BatchRequestTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/batchResponse/BatchResponseTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/compareRequest/CompareRequestTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/compareResponse/CompareResponseTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/delRequest/DelRequestTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/delResponse/DelResponseTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/errorResponse/ErrorResponseTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/extendedRequest/ExtendedRequestTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/extendedResponse/ExtendedResponseTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/modDNRequest/ModifyDNRequestTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/modDNResponse/ModifyDNResponseTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/modifyRequest/ModifyRequestTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/modifyResponse/ModifyResponseTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/searchRequest/SearchRequestTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/searchResponse/SearchResponseTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/java/org/apache/directory/ldapstudio/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/addRequest/request_with_1_attr_without_value.xml
directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/test/resources/org/apache/directory/ldapstudio/dsmlv2/compareRequest/request_with_1_assertion_without_value.xml
Modified: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/AbstractGrammar.java
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/AbstractGrammar.java?view=diff&rev=483066&r1=483065&r2=483066
==============================================================================
--- directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/AbstractGrammar.java (original)
+++ directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/AbstractGrammar.java Wed Dec 6 05:17:42 2006
@@ -26,6 +26,7 @@
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
+
/**
* The abstract IGrammar which is the Mother of all the grammars. It contains
* the transitions table.
@@ -46,9 +47,10 @@
/** The grammar's states */
protected IStates statesEnum;
+
public AbstractGrammar()
{
-
+
}
@@ -114,12 +116,12 @@
{
this.statesEnum = statesEnum;
}
-
+
public void executeAction( Dsmlv2Container container ) throws Exception
- {
+ {
XmlPullParser xpp = container.getParser();
-
+
int eventType = xpp.getEventType();
do
{
@@ -144,19 +146,19 @@
while ( eventType != XmlPullParser.END_DOCUMENT );
}
-
+
private void processTag( Dsmlv2Container container, int tagType ) throws Exception
- {
+ {
XmlPullParser xpp = container.getParser();
-
+
String tagName = xpp.getName().toLowerCase();
-
- GrammarTransition transition = getTransition( container.getState(), new Tag( tagName, tagType) );
-
- if (transition != null)
+
+ GrammarTransition transition = getTransition( container.getState(), new Tag( tagName, tagType ) );
+
+ if ( transition != null )
{
container.setState( transition.getNextState() );
-
+
if ( transition.hasAction() )
{
transition.getAction().action( container );
@@ -164,7 +166,8 @@
}
else
{
- throw new XmlPullParserException( "The tag " + new Tag(tagName, tagType) + " can't be found at this position" , xpp, null );
+ throw new XmlPullParserException( "The tag " + new Tag( tagName, tagType )
+ + " can't be found at this position", xpp, null );
}
}
}
Modified: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/BatchRequest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/BatchRequest.java?view=diff&rev=483066&r1=483065&r2=483066
==============================================================================
--- directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/BatchRequest.java (original)
+++ directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/BatchRequest.java Wed Dec 6 05:17:42 2006
@@ -20,93 +20,118 @@
package org.apache.directory.ldapstudio.dsmlv2;
+
import java.util.ArrayList;
import java.util.List;
import org.apache.directory.shared.ldap.codec.LdapMessage;
+
public class BatchRequest
{
private List<LdapMessage> requests;
-
+
private int requestID;
-
- public enum Processing { SEQUENTIAL, PARALLEL };
-
+
+ public enum Processing
+ {
+ SEQUENTIAL, PARALLEL
+ };
+
private Processing processing;
-
- public enum OnError { RESUME, EXIT };
-
+
+ public enum OnError
+ {
+ RESUME, EXIT
+ };
+
private OnError onError;
-
- public enum ResponseOrder { SEQUENTIAL, UNORDERED };
-
+
+ public enum ResponseOrder
+ {
+ SEQUENTIAL, UNORDERED
+ };
+
private ResponseOrder responseOrder;
-
+
+
public BatchRequest()
{
requests = new ArrayList<LdapMessage>();
}
-
- public boolean addRequest(LdapMessage request)
+
+
+ public boolean addRequest( LdapMessage request )
{
return requests.add( request );
}
-
+
+
public LdapMessage getCurrentRequest()
{
return requests.get( requests.size() - 1 );
}
+
public int getRequestID()
{
return requestID;
}
+
public void setRequestID( int requestID )
{
this.requestID = requestID;
}
+
public Processing getProcessing()
{
return processing;
}
+
public void setProcessing( Processing processing )
{
this.processing = processing;
}
+
public OnError getOnError()
{
return onError;
}
+
public void setOnError( OnError onError )
{
this.onError = onError;
}
+
public ResponseOrder getResponseOrder()
{
return responseOrder;
}
+
public void setResponseOrder( ResponseOrder responseOrder )
{
this.responseOrder = responseOrder;
}
-
- public List getRequests() {
- return requests;
- }
+
+
+ public List getRequests()
+ {
+ return requests;
+ }
+
@Override
public String toString()
{
StringBuffer sb = new StringBuffer();
-
+
sb.append( "[" );
sb.append( "processing: " + processing );
sb.append( " - " );
Modified: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/BatchResponse.java
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/BatchResponse.java?view=diff&rev=483066&r1=483065&r2=483066
==============================================================================
--- directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/BatchResponse.java (original)
+++ directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/BatchResponse.java Wed Dec 6 05:17:42 2006
@@ -20,43 +20,53 @@
package org.apache.directory.ldapstudio.dsmlv2;
+
import java.util.ArrayList;
import java.util.List;
import org.apache.directory.shared.ldap.codec.LdapResponse;
-public class BatchResponse {
-
+
+public class BatchResponse
+{
+
private List<LdapResponse> responses;
-
+
private int requestID;
-
+
+
public BatchResponse()
{
- responses = new ArrayList<LdapResponse>();
+ responses = new ArrayList<LdapResponse>();
}
-
- public boolean addResponse(LdapResponse response)
+
+
+ public boolean addResponse( LdapResponse response )
{
return responses.add( response );
}
-
+
+
public LdapResponse getCurrentResponse()
{
return responses.get( responses.size() - 1 );
}
-
+
+
public int getRequestID()
{
return requestID;
}
+
public void setRequestID( int requestID )
{
this.requestID = requestID;
}
- public List getResponses() {
- return responses;
- }
+
+ public List getResponses()
+ {
+ return responses;
+ }
}
Modified: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Container.java
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Container.java?view=diff&rev=483066&r1=483065&r2=483066
==============================================================================
--- directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Container.java (original)
+++ directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Container.java Wed Dec 6 05:17:42 2006
@@ -20,6 +20,7 @@
package org.apache.directory.ldapstudio.dsmlv2;
+
public interface Container
{
// ~ Methods
@@ -42,6 +43,7 @@
*/
void setState( int state );
+
/**
* Get the transition
*
@@ -63,6 +65,5 @@
* @return Returns the states.
*/
public IStates getStates();
-
}
Modified: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Dsmlv2Container.java
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Dsmlv2Container.java?view=diff&rev=483066&r1=483065&r2=483066
==============================================================================
--- directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Dsmlv2Container.java (original)
+++ directory/sandbox/pamarcelot/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Dsmlv2Container.java Wed Dec 6 05:17:42 2006
@@ -20,35 +20,39 @@
package org.apache.directory.ldapstudio.dsmlv2;
+
import org.xmlpull.v1.XmlPullParser;
+
public class Dsmlv2Container implements Container
{
/** The current state of the decoding */
private int state;
-
+
/** The current transition */
private int transition;
-
+
/** Store the different states for debug purpose */
private IStates states;
-
+
/** The pool parser */
private XmlPullParser parser;
-
+
/** The BatchRequest of the parsing */
private BatchRequest batchRequest;
-
+
/** The BatchResponse of the parsing */
private BatchResponse batchResponse;
-
+
private AbstractGrammar grammar;
-
+
+
public Dsmlv2Container()
- {
+ {
//grammar = Dsmlv2Grammar.getInstance();
}
-
+
+
/**
* Get the DSML Batch Request
*
@@ -58,7 +62,8 @@
{
return batchRequest;
}
-
+
+
/**
* Sets the DSML Batch Request
* @param batchRequest
@@ -67,7 +72,8 @@
{
this.batchRequest = batchRequest;
}
-
+
+
/**
* Get the DSML Batch Response
*
@@ -77,7 +83,8 @@
{
return batchResponse;
}
-
+
+
/**
* Sets the DSML Batch Request
* @param batchRequest
@@ -86,8 +93,8 @@
{
this.batchResponse = batchResponse;
}
-
-
+
+
/**
* Get the parser
*
@@ -97,7 +104,7 @@
{
return parser;
}
-
+
/**
* Set the parser
@@ -105,11 +112,12 @@
* @param state
* The parser
*/
- public void setParser( XmlPullParser parser)
+ public void setParser( XmlPullParser parser )
{
this.parser = parser;
}
-
+
+
/**
* Get the current grammar state
*
@@ -119,7 +127,7 @@
{
return state;
}
-
+
/**
* Set the new current state
@@ -142,7 +150,7 @@
{
return transition;
}
-
+
/**
* Update the transition from a state to another
@@ -154,7 +162,7 @@
{
this.transition = transition;
}
-
+
/**
* Get the states for this container's grammars
@@ -166,16 +174,19 @@
return states;
}
+
public AbstractGrammar getGrammar()
{
return grammar;
}
+
public void setGrammar( AbstractGrammar grammar )
{
this.grammar = grammar;
}
-
+
+
/**
* Get the transition associated with the state and tag
*