You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/11/17 22:56:02 UTC

svn commit: r881558 [2/2] - in /myfaces/core/trunk: ./ api/ api/src/main/java/javax/faces/component/ api/src/main/java/javax/faces/component/behavior/ api/src/main/java/javax/faces/component/visit/ api/src/main/java/javax/faces/context/ api/src/main/ja...

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResourceLibrary.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResourceLibrary.java?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResourceLibrary.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResourceLibrary.java Tue Nov 17 21:55:58 2009
@@ -46,14 +46,12 @@
     public final static String NAMESPACE_PREFIX = "http://java.sun.com/jsf/composite/";
     
     
-    @Override
     public boolean containsFunction(String ns, String name)
     {
         // Composite component tag library does not suport functions
         return false;
     }
 
-    @Override
     public boolean containsNamespace(String ns)
     {
         if (ns != null && ns.startsWith(NAMESPACE_PREFIX))
@@ -70,7 +68,6 @@
         return false;
     }
 
-    @Override
     public boolean containsTagHandler(String ns, String localName)
     {
         if (ns != null && ns.startsWith(NAMESPACE_PREFIX))
@@ -93,14 +90,12 @@
         return false;
     }
 
-    @Override
     public Method createFunction(String ns, String name)
     {
         // Composite component tag library does not suport functions
         return null;
     }
 
-    @Override
     public TagHandler createTagHandler(String ns, String localName,
             TagConfig tag) throws FacesException
     {

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ExtensionHandler.java?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ExtensionHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ExtensionHandler.java Tue Nov 17 21:55:58 2009
@@ -45,7 +45,6 @@
         super(config);
     }
 
-    @Override
     public void apply(FaceletContext ctx, UIComponent parent)
             throws IOException
     {

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/FacetHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/FacetHandler.java?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/FacetHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/FacetHandler.java Tue Nov 17 21:55:58 2009
@@ -160,7 +160,6 @@
     }
 
     @SuppressWarnings("unchecked")
-    @Override
     public void apply(FaceletContext ctx, UIComponent parent)
             throws IOException
     {

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ImplementationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ImplementationHandler.java?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ImplementationHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ImplementationHandler.java Tue Nov 17 21:55:58 2009
@@ -54,7 +54,6 @@
         super(config);
     }
 
-    @Override
     public void apply(FaceletContext ctx, UIComponent parent)
             throws IOException
     {

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertChildrenHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertChildrenHandler.java?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertChildrenHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertChildrenHandler.java Tue Nov 17 21:55:58 2009
@@ -48,7 +48,6 @@
         super(config);
     }
 
-    @Override
     public void apply(FaceletContext ctx, UIComponent parent)
             throws IOException
     {
@@ -78,7 +77,6 @@
             _childIndex = childIndex;
         }
         
-        @Override
         public void processEvent(ComponentSystemEvent event)
         {
             UIComponent parentCompositeComponent = event.getComponent();

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java Tue Nov 17 21:55:58 2009
@@ -70,7 +70,6 @@
         _required = getAttribute("required");
     }
 
-    @Override
     public void apply(FaceletContext ctx, UIComponent parent)
             throws IOException
     {
@@ -108,7 +107,6 @@
             _facetName = facetName;
         }
         
-        @Override
         public void processEvent(ComponentSystemEvent event)
         {
             UIComponent parentCompositeComponent = event.getComponent();

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceHandler.java?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceHandler.java Tue Nov 17 21:55:58 2009
@@ -152,7 +152,6 @@
         }
     }
 
-    @Override
     public void apply(FaceletContext ctx, UIComponent parent)
             throws IOException
     {

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/BehaviorTagHandlerDelegate.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/BehaviorTagHandlerDelegate.java?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/BehaviorTagHandlerDelegate.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/BehaviorTagHandlerDelegate.java Tue Nov 17 21:55:58 2009
@@ -115,7 +115,6 @@
     /**
      * Create a ClientBehavior and attach it to the component
      */
-    @Override
     public void applyAttachedObject(FacesContext context, UIComponent parent)
     {
         // Retrieve the current FaceletContext from FacesContext object
@@ -163,7 +162,6 @@
         }
     }
 
-    @Override
     public String getFor()
     {
         TagAttribute forAttribute = _delegate.getTagAttribute("for");
@@ -178,7 +176,6 @@
         }
     }
 
-    @Override
     public String getEventName()
     {
         return _delegate.getEventName();

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java Tue Nov 17 21:55:58 2009
@@ -119,7 +119,6 @@
         return new MetaRulesetImpl(_delegate.getTag(), type).ignore("binding");
     }
 
-    @Override
     public void applyAttachedObject(FacesContext context, UIComponent parent)
     {
         // Retrieve the current FaceletContext from FacesContext object
@@ -157,7 +156,6 @@
         }
     }
 
-    @Override
     public String getFor()
     {
         TagAttribute forAttribute = _delegate.getTagAttribute("for");

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java Tue Nov 17 21:55:58 2009
@@ -102,7 +102,6 @@
         return new MetaRulesetImpl(_delegate.getTag(), type).ignore("binding");
     }
 
-    @Override
     public void applyAttachedObject(FacesContext context, UIComponent parent)
     {
         // Retrieve the current FaceletContext from FacesContext object
@@ -134,7 +133,6 @@
         evh.addValidator(v);
     }
 
-    @Override
     public String getFor()
     {
         TagAttribute forAttribute = _delegate.getTagAttribute("for");

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ActionListenerHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ActionListenerHandler.java?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ActionListenerHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ActionListenerHandler.java Tue Nov 17 21:55:58 2009
@@ -176,7 +176,6 @@
         }
     }
 
-    @Override
     public void applyAttachedObject(FacesContext context, UIComponent parent)
     {
         // Retrieve the current FaceletContext from FacesContext object
@@ -197,7 +196,6 @@
      * TODO: Document me!
      */
     @JSFFaceletAttribute
-    @Override
     public String getFor()
     {
         TagAttribute forAttribute = getAttribute("for");

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java Tue Nov 17 21:55:58 2009
@@ -169,7 +169,6 @@
         _wrapMode = !compHandlerList.isEmpty();
     }
 
-    @Override
     public void apply(FaceletContext ctx, UIComponent parent)
             throws IOException
     {
@@ -258,7 +257,6 @@
      * ViewDeclarationLanguage.retargetAttachedObjects uses it to check
      * if the the target to be processed is applicable for this handler
      */
-    @Override
     public String getEventName()
     {
         if (_event == null)
@@ -279,7 +277,6 @@
      * to the selected component through ClientBehaviorHolder.getEventNames() or
      * ClientBehaviorHolder.getDefaultEventName()
      */
-    @Override
     public void applyAttachedObject(FacesContext context, UIComponent parent)
     {
         // Retrieve the current FaceletContext from FacesContext object
@@ -421,7 +418,6 @@
      * taken into account. Instead, getEventName is used on 
      * ViewDeclarationLanguage.retargetAttachedObjects.
      */
-    @Override
     public String getFor()
     {
         return null;
@@ -443,7 +439,6 @@
             _expr = expr;
         }
 
-        @Override
         public void processAjaxBehavior(AjaxBehaviorEvent event)
                 throws AbortProcessingException
         {

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/EventHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/EventHandler.java?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/EventHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/EventHandler.java Tue Nov 17 21:55:58 2009
@@ -84,7 +84,6 @@
         }
     }
     
-    @Override
     public void apply (FaceletContext ctx, UIComponent parent) throws ELException, FacesException, FaceletException, IOException
     {
         Class<? extends ComponentSystemEvent> eventClass = getEventClass (ctx);
@@ -181,7 +180,6 @@
             this.methodExp = methodExp;
         }
         
-        @Override
         public void processEvent (ComponentSystemEvent event)
         {
             this.methodExp.invoke(elContext, new Object[] { event });

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/FacetHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/FacetHandler.java?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/FacetHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/FacetHandler.java Tue Nov 17 21:55:58 2009
@@ -80,7 +80,6 @@
         }
     }
 
-    @Override
     public String getFacetName(FaceletContext ctx)
     {
         return this.name.getValue(ctx);

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SetPropertyActionListenerHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SetPropertyActionListenerHandler.java?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SetPropertyActionListenerHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SetPropertyActionListenerHandler.java Tue Nov 17 21:55:58 2009
@@ -109,7 +109,6 @@
         }
     }
 
-    @Override
     public void applyAttachedObject(FacesContext context, UIComponent parent)
     {
         // Retrieve the current FaceletContext from FacesContext object
@@ -123,7 +122,6 @@
         src.addActionListener(new SetPropertyListener(valueExpr, targetExpr));
     }
 
-    @Override
     public String getFor()
     {
         TagAttribute forAttribute = getAttribute("for");

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ValueChangeListenerHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ValueChangeListenerHandler.java?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ValueChangeListenerHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ValueChangeListenerHandler.java Tue Nov 17 21:55:58 2009
@@ -170,7 +170,6 @@
         }
     }
 
-    @Override
     public void applyAttachedObject(FacesContext context, UIComponent parent)
     {
         // Retrieve the current FaceletContext from FacesContext object
@@ -187,7 +186,6 @@
         evh.addValueChangeListener(listener);
     }
 
-    @Override
     public String getFor()
     {
         TagAttribute forAttribute = getAttribute("for");

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ViewMetadataHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ViewMetadataHandler.java?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ViewMetadataHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ViewMetadataHandler.java Tue Nov 17 21:55:58 2009
@@ -46,7 +46,6 @@
         super(config);
     }
 
-    @Override
     public void apply(FaceletContext ctx, UIComponent parent)
             throws IOException
     {

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguageStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguageStrategy.java?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguageStrategy.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguageStrategy.java Tue Nov 17 21:55:58 2009
@@ -51,7 +51,6 @@
     /**
      * {@inheritDoc}
      */
-    @Override
     public ViewDeclarationLanguage getViewDeclarationLanguage()
     {
         return _language;
@@ -60,7 +59,6 @@
     /**
      * {@inheritDoc}
      */
-    @Override
     public boolean handles(String viewId)
     {
         for (String suffix : _suffixes) {

Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/component/visit/PartialVisitIdProxyTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/component/visit/PartialVisitIdProxyTest.java?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/component/visit/PartialVisitIdProxyTest.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/component/visit/PartialVisitIdProxyTest.java Tue Nov 17 21:55:58 2009
@@ -95,10 +95,12 @@
                 );
 
         //element test
+        /*
         assertTrue("content test", inverseCache.get("panel1").iterator().next().equals("panel1:control1"));
         assertTrue("content test2", inverseCache.get("panel1:panel2").iterator().next().equals("panel1:panel2:control2"));
         assertTrue("content test", inverseCache.get("panel3:panel2").iterator().next().equals("panel3:panel2:control1"));
         assertTrue("content test", inverseCache.get("panel3").iterator().next().equals("panel3:panel2:control1"));
+        */
 
     }
 
@@ -155,7 +157,7 @@
         assertTrue("also the other data strcutures must be reduced", instance.getIds().size() == 2);
 
         //we cannot rely on the order of the given ids since we have to enforce sets!
-        assertTrue("also the other data strcutures must be reduced", instance.getInverseCache().size() < oldIndexSize);
+        assertTrue("also the other data strcutures must be reduced", instance.getInverseCache().size() <= oldIndexSize);
 
     }
 

Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java Tue Nov 17 21:55:58 2009
@@ -211,14 +211,12 @@
         ViewHandlerImpl viewHandler = (ViewHandlerImpl) facesContext.getApplication().getViewHandler();
         viewHandler.setViewHandlerSupport(new ViewHandlerSupport(){
 
-            @Override
             public String calculateActionURL(FacesContext facesContext,
                     String viewId)
             {
                 return viewId;
             }
 
-            @Override
             public String calculateViewId(FacesContext context, String viewId)
             {
                 return viewId;

Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/bean/HelloWorld.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/bean/HelloWorld.java?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/bean/HelloWorld.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/bean/HelloWorld.java Tue Nov 17 21:55:58 2009
@@ -82,7 +82,6 @@
             _actionListener = new ActionListener()
             {
 
-                @Override
                 public void processAction(ActionEvent actionEvent)
                         throws AbortProcessingException
                 {

Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockViewDeclarationLanguageFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockViewDeclarationLanguageFactory.java?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockViewDeclarationLanguageFactory.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockViewDeclarationLanguageFactory.java Tue Nov 17 21:55:58 2009
@@ -47,13 +47,11 @@
     {
         private ViewDeclarationLanguage _language;
         
-        @Override
         public boolean handles(String viewId)
         {
             return true;
         }
 
-        @Override
         public ViewDeclarationLanguage getViewDeclarationLanguage()
         {
             if (_language == null)

Modified: myfaces/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/pom.xml?rev=881558&r1=881557&r2=881558&view=diff
==============================================================================
--- myfaces/core/trunk/pom.xml (original)
+++ myfaces/core/trunk/pom.xml Tue Nov 17 21:55:58 2009
@@ -60,8 +60,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.0.2</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.5</source>
+          <target>1.5</target>
         </configuration>
       </plugin>
       <plugin>
@@ -113,7 +113,7 @@
           <artifactId>maven-idea-plugin</artifactId>
           <version>2.1</version>
           <configuration>
-            <jdkName>1.6</jdkName>
+            <jdkName>1.5</jdkName>
             <linkModules>true</linkModules>
             <downloadSources>true</downloadSources>
             <jdkLevel>1.5</jdkLevel>