You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by aw...@apache.org on 2006/08/06 23:12:54 UTC
svn commit: r429208 [3/14] - in /incubator/adffaces/trunk/trinidad:
trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/
trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/
trinidad-api/src/main/java/org/apache/myfaces/trinidad/co...
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/FacesContextFactoryImpl.java Sun Aug 6 16:12:37 2006
@@ -48,8 +48,12 @@
_factory = factory;
}
- public FacesContext getFacesContext(Object context, Object request,
- Object response, Lifecycle lifecycle)
+ @Override
+ public FacesContext getFacesContext(
+ Object context,
+ Object request,
+ Object response,
+ Lifecycle lifecycle)
{
return new CacheRenderKit(_factory.getFacesContext(context,
request,
@@ -66,36 +70,46 @@
setCurrentInstance(this);
}
+ @Override
public Application getApplication()
{
return _base.getApplication();
}
+ @SuppressWarnings("unchecked")
+ @Override
public Iterator getClientIdsWithMessages()
{
return _base.getClientIdsWithMessages();
}
+ @Override
public ExternalContext getExternalContext()
{
return _external;
}
+ @Override
public FacesMessage.Severity getMaximumSeverity()
{
return _base.getMaximumSeverity();
}
+ @SuppressWarnings("unchecked")
+ @Override
public Iterator getMessages()
{
return _base.getMessages();
}
+ @SuppressWarnings("unchecked")
+ @Override
public Iterator getMessages(String clientId)
{
return _base.getMessages(clientId);
}
+ @Override
public RenderKit getRenderKit()
{
if (_kit == null)
@@ -124,61 +138,73 @@
return _kit;
}
+ @Override
public boolean getRenderResponse()
{
return _base.getRenderResponse();
}
+ @Override
public boolean getResponseComplete()
{
return _base.getResponseComplete();
}
+ @Override
public ResponseStream getResponseStream()
{
return _base.getResponseStream();
}
+ @Override
public void setResponseStream(ResponseStream responseStream)
{
_base.setResponseStream(responseStream);
}
+ @Override
public ResponseWriter getResponseWriter()
{
return _base.getResponseWriter();
}
+ @Override
public void setResponseWriter(ResponseWriter responseWriter)
{
_base.setResponseWriter(responseWriter);
}
+ @Override
public UIViewRoot getViewRoot()
{
return _base.getViewRoot();
}
+ @Override
public void setViewRoot(UIViewRoot viewRoot)
{
_base.setViewRoot(viewRoot);
}
+ @Override
public void addMessage(String clientId, FacesMessage facesMessage)
{
_base.addMessage(clientId, facesMessage);
}
+ @Override
public void release()
{
_base.release();
}
+ @Override
public void renderResponse()
{
_base.renderResponse();
}
+ @Override
public void responseComplete()
{
_base.responseComplete();
@@ -197,6 +223,7 @@
_decorated = decorated;
}
+ @Override
public void dispatch(String path) throws IOException
{
RequestContext afc = RequestContext.getCurrentInstance();
@@ -209,6 +236,7 @@
}
+ @Override
protected ExternalContext getExternalContext()
{
return _decorated;
@@ -219,6 +247,9 @@
private final FacesContextFactory _factory;
+ // 2006-08-02; -= Simon Lessard =-
+ // There's nothing logged in this class at this time.
+ @SuppressWarnings("unused")
static private final TrinidadLogger _LOG =
TrinidadLogger.createTrinidadLogger(FacesContextFactoryImpl.class);
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageFlowScopeMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageFlowScopeMap.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageFlowScopeMap.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageFlowScopeMap.java Sun Aug 6 16:12:37 2006
@@ -34,7 +34,7 @@
*
* @author The Oracle ADF Faces Team
*/
-class PageFlowScopeMap implements Map, Serializable
+class PageFlowScopeMap implements Map<String, Object>, Serializable
{
/**
* Return a PageFlowScopeMap stored with a token.
@@ -87,7 +87,7 @@
childToken = token.substring(lastSeparator + 1);
}
- Map storeMap = _createMapToStore(context, parentToken);
+ Map<String, Object> storeMap = _createMapToStore(context, parentToken);
return (PageFlowScopeMap) storeMap.get(childToken);
}
@@ -101,11 +101,11 @@
public PageFlowScopeMap(int lifetime)
{
- this(new HashMap(13), null, new SharedData(lifetime));
+ this(new HashMap<String, Object>(13), null, new SharedData(lifetime));
}
private PageFlowScopeMap(
- HashMap map,
+ HashMap<String, Object> map,
String token,
SharedData sharedData)
{
@@ -124,7 +124,7 @@
_sharedData = new SharedData(parent._sharedData._lifetime);
_sharedData._parent = parent;
- _map = new HashMap();
+ _map = new HashMap<String, Object>();
if (copyParent)
_map.putAll(parent._map);
}
@@ -160,7 +160,7 @@
cache = _getRootTokenCache(context, _sharedData._lifetime);
}
- Map store = _createMapToStore(context, parentToken);
+ Map<String, Object> store = _createMapToStore(context, parentToken);
String token = cache.addNewEntry(this, store);
@@ -181,7 +181,8 @@
return _token;
}
- static private Map _createMapToStore(
+ @SuppressWarnings("unchecked")
+ static private Map<String, Object> _createMapToStore(
FacesContext context,
String parentToken)
{
@@ -201,6 +202,7 @@
fullToken);
}
+ @Override
public boolean equals(Object o)
{
if (o instanceof PageFlowScopeMap)
@@ -209,6 +211,7 @@
return _map.equals(o);
}
+ @Override
public int hashCode()
{
return _map.hashCode();
@@ -234,7 +237,7 @@
return _map.containsValue(value);
}
- public Collection values()
+ public Collection<Object> values()
{
// Use an unmodifiableCollection to save me the headache
// of catching mutations
@@ -242,14 +245,14 @@
}
- public Set entrySet()
+ public Set<Map.Entry<String, Object>> entrySet()
{
// Use an unmodifiableSet to save me the headache
// of catching mutations
return Collections.unmodifiableSet(_map.entrySet());
}
- public Set keySet()
+ public Set<String> keySet()
{
// Use an unmodifiableSet to save me the headache
// of catching mutations
@@ -261,7 +264,7 @@
return _map.get(key);
}
- public Object put(Object key, Object value)
+ public Object put(String key, Object value)
{
_detachIfNeeded();
if (_LOG.isFine())
@@ -283,7 +286,7 @@
return _map.remove(key);
}
- public void putAll(Map t)
+ public void putAll(Map<? extends String, ? extends Object> t)
{
_detachIfNeeded();
if (_LOG.isFine())
@@ -332,7 +335,7 @@
// Remove ourselves
if (_sharedData._parent != null)
{
- Map storeMap = _createMapToStore(context, parentToken);
+ Map<String, Object> storeMap = _createMapToStore(context, parentToken);
_sharedData._parent._sharedData._children.removeOldEntry(childToken,
storeMap);
}
@@ -347,11 +350,12 @@
// this will in fact automatically recurse through all children
// grandchildren etc. - which is kind of a design flaw of SubKeyMap,
// but one we're relying on
- Map store = _createMapToStore(context, token);
+ Map<String, Object> store = _createMapToStore(context, token);
store.clear();
_sharedData._children = null;
}
+ @Override
public String toString()
{
return "PageFlowScopeMap@" + System.identityHashCode(this) +
@@ -383,11 +387,12 @@
// repeatedly during Render Response *without further
// mutations*. Both of these assumptions seem very
// dubious!
+ @SuppressWarnings("unchecked")
private void _detachIfNeeded()
{
if (_token != null)
{
- _map = (HashMap) _map.clone();
+ _map = (HashMap<String, Object>) _map.clone();
_token = null;
// =-=AEW When do we discard children?
@@ -416,7 +421,7 @@
private SharedData _sharedData;
private String _token;
- private HashMap _map;
+ private HashMap<String, Object> _map;
static private final String _PAGE_FLOW_SCOPE_CACHE =
"org.apache.myfaces.trinidadinternal.application.PageFlowScope";
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageFlowScopeProviderImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageFlowScopeProviderImpl.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageFlowScopeProviderImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageFlowScopeProviderImpl.java Sun Aug 6 16:12:37 2006
@@ -38,7 +38,8 @@
{
}
- public Map getPageFlowScope(FacesContext context)
+ @Override
+ public Map<String, Object> getPageFlowScope(FacesContext context)
{
PageFlowScopeMap pageFlowScope = _getPageFlowScope(context);
if (pageFlowScope == null)
@@ -68,7 +69,8 @@
return pageFlowScope;
}
- public Map pushPageFlowScope(FacesContext context, boolean copyParent)
+ @Override
+ public Map<String, Object> pushPageFlowScope(FacesContext context, boolean copyParent)
{
PageFlowScopeMap oldPageFlowScope = (PageFlowScopeMap) getPageFlowScope(context);
if (oldPageFlowScope.getToken(context) != null)
@@ -86,7 +88,8 @@
return oldPageFlowScope;
}
- public Map popPageFlowScope(FacesContext context, boolean discardScope)
+ @Override
+ public Map<String, Object> popPageFlowScope(FacesContext context, boolean discardScope)
{
PageFlowScopeMap oldPageFlowScope = _getPageFlowScope(context);
@@ -103,6 +106,7 @@
return oldPageFlowScope;
}
+ @Override
public String encodeCurrentPageFlowScopeURL(FacesContext context, String url)
{
PageFlowScopeMap pageFlowScope = (PageFlowScopeMap) getPageFlowScope(context);
@@ -137,6 +141,7 @@
// Store the page flow scope
// =-=AEW MAKE THIS PRIVATE WHNE OBSOLETE DIALOGSERVICE METHODS
// ARE REMOVED
+ @SuppressWarnings("unchecked")
static void __setPageFlowScope(FacesContext context,
PageFlowScopeMap pageFlowScope)
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageResolverDefaultImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageResolverDefaultImpl.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageResolverDefaultImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/PageResolverDefaultImpl.java Sun Aug 6 16:12:37 2006
@@ -37,6 +37,7 @@
* @param viewId {@inheritDoc}
* @return {@inheritDoc}
*/
+ @Override
public String getPhysicalURI(String viewId)
{
return viewId;
@@ -45,6 +46,7 @@
/**
* Encodes an action URI.
*/
+ @Override
public String encodeActionURI(String actionURI)
{
return actionURI;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java Sun Aug 6 16:12:37 2006
@@ -64,6 +64,7 @@
TYPE.lock();
}
+ @Override
public Type getType()
{
return TYPE;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextFactoryImpl.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextFactoryImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextFactoryImpl.java Sun Aug 6 16:12:37 2006
@@ -37,6 +37,7 @@
{
}
+ @Override
public RequestContext createContext(Object context,
Object request)
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java Sun Aug 6 16:12:37 2006
@@ -15,10 +15,11 @@
*/
package org.apache.myfaces.trinidadinternal.context;
-
+import java.awt.Color;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
@@ -82,6 +83,7 @@
{
_bean = bean;
_dialogService = new DialogServiceImpl(this);
+ _partialTargets = new HashSet<String>();
}
public void init(Object request)
@@ -90,28 +92,33 @@
}
+ @Override
public DialogService getDialogService()
{
return _dialogService;
}
+ @Override
public PageResolver getPageResolver()
{
return _pageResolver;
}
+ @Override
public PageFlowScopeProvider getPageFlowScopeProvider()
{
return _pageFlowScopeProvider;
}
- public Map getPageFlowScope()
+ @Override
+ public Map<String, Object> getPageFlowScope()
{
return _pageFlowScopeProvider.getPageFlowScope(__getFacesContext());
}
- public void returnFromDialog(Object returnValue, Map returnParameters)
+ @Override
+ public void returnFromDialog(Object returnValue, Map<Object, Object> returnParameters)
{
boolean dialogIsInaccessible =
_dialogService.returnFromDialog(returnValue, returnParameters);
@@ -125,12 +132,13 @@
* Launch a dialog.
* @todo Don't save parameters for state-saving, page-flow scope, etc.
*/
+ @Override
public void launchDialog(
UIViewRoot dialogRoot,
- Map dialogParameters,
+ Map<String, Object> dialogParameters,
UIComponent source,
boolean useWindow,
- Map windowProperties)
+ Map<String, Object> windowProperties)
{
_pageFlowScopeProvider.pushPageFlowScope(__getFacesContext(),
true);
@@ -141,6 +149,7 @@
windowProperties);
}
+ @Override
public UploadedFileProcessor getUploadedFileProcessor()
{
return (UploadedFileProcessor)
@@ -148,6 +157,7 @@
}
+ @Override
public boolean isPostback()
{
FacesContext context = __getFacesContext();
@@ -175,13 +185,15 @@
return true;
}
+ @SuppressWarnings("unchecked")
+ @Override
public boolean isPartialRequest(FacesContext context)
{
- Map requestMap = context.getExternalContext().getRequestMap();
+ Map<String, Object> requestMap = context.getExternalContext().getRequestMap();
if (Boolean.TRUE.equals(requestMap.get(XhtmlConstants.PARTIAL_PARAM)))
return true;
- Map parameters = context.getExternalContext().getRequestParameterMap();
+ Map<String, Object> parameters = context.getExternalContext().getRequestParameterMap();
if ("true".equals(parameters.get("partial")))
return true;
@@ -189,24 +201,28 @@
}
+ @Override
public boolean isDebugOutput()
{
return Boolean.TRUE.equals(
_bean.getProperty(RequestContextBean.DEBUG_OUTPUT_KEY));
}
+ @Override
public boolean isClientValidationDisabled()
{
return Boolean.TRUE.equals(
_bean.getProperty(RequestContextBean.CLIENT_VALIDATION_DISABLED_KEY));
}
+ @Override
public String getOutputMode()
{
return (String) _bean.getProperty(RequestContextBean.OUTPUT_MODE_KEY);
}
// get skinFamily; default to minimal if nothing is specified.
+ @Override
public String getSkinFamily()
{
String skinFamily =
@@ -216,6 +232,7 @@
return skinFamily;
}
+ @Override
public String getAccessibilityMode()
{
String s = (String) _bean.getProperty(
@@ -233,6 +250,7 @@
return null;
}
+ @Override
public char getNumberGroupingSeparator()
{
Character c = (Character) _bean.getProperty(
@@ -243,6 +261,7 @@
return (char) 0;
}
+ @Override
public char getDecimalSeparator()
{
Character c = (Character) _bean.getProperty(
@@ -254,6 +273,7 @@
}
+ @Override
public TimeZone getTimeZone()
{
TimeZone tz = (TimeZone) _bean.getProperty(RequestContextBean.TIME_ZONE_KEY);
@@ -277,10 +297,12 @@
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("unchecked")
+ @Override
public ChangeManager getChangeManager()
{
FacesContext context = __getFacesContext();
- Map appMap = context.getExternalContext().getApplicationMap();
+ Map<String, Object> appMap = context.getExternalContext().getApplicationMap();
ChangeManager changeManager = (ChangeManager)appMap.get(_CHANGE_MANAGER_KEY);
if (changeManager == null)
@@ -325,7 +347,7 @@
{
try
{
- Class managerClass = ClassLoaderUtils.loadClass(className);
+ Class<?> managerClass = ClassLoaderUtils.loadClass(className);
return (ChangeManager)managerClass.newInstance();
}
catch (Throwable throwable)
@@ -337,23 +359,27 @@
}
+ @Override
public RegionManager getRegionManager()
{
FacesContext context = __getFacesContext();
return RegionMetadata.getRegionMetadata(context);
}
+ @Override
public String getCurrencyCode()
{
return (String) _bean.getProperty(RequestContextBean.CURRENCY_CODE_KEY);
}
+ @Override
public String getOracleHelpServletUrl()
{
return (String) _bean.getProperty(
RequestContextBean.ORACLE_HELP_SERVLET_URL_KEY);
}
+ @Override
public boolean isRightToLeft()
{
Boolean b = (Boolean) _bean.getProperty(RequestContextBean.RIGHT_TO_LEFT_KEY);
@@ -372,7 +398,8 @@
}
- public Map getHelpTopic()
+ @Override
+ public Map<String, Object> getHelpTopic()
{
HelpProvider provider = _getHelpProvider();
if (provider == null)
@@ -381,7 +408,8 @@
return provider.getHelpTopicMap();
}
- public Map getHelpSystem()
+ @Override
+ public Map<String, Object> getHelpSystem()
{
HelpProvider provider = _getHelpProvider();
if (provider == null)
@@ -394,6 +422,7 @@
// Partial Page Rendering support
//
+ @Override
public void addPartialTarget(UIComponent newTarget)
{
FacesContext fContext = __getFacesContext();
@@ -437,6 +466,7 @@
}
}
+ @Override
public void addPartialTriggerListeners
(UIComponent listener,
String[] triggers)
@@ -444,31 +474,30 @@
if ((listener == null) || (triggers == null))
return;
- Map pl = _getPartialListeners();
+ Map<UIComponent, Set<UIComponent>> pl = _getPartialListeners();
for (int i = 0; i < triggers.length; i++)
{
String trigger = triggers[i];
- Object master;
-
// Wildcards removed for now....
// if ("*".equals(trigger))
// master = _GLOBAL_TRIGGER;
// else
- master = listener.getParent().findComponent(trigger);
+ UIComponent master = listener.getParent().findComponent(trigger);
// Get the set of listeners on this trigger and add this component.
- Set listeners = (Set) pl.get(master);
+ Set<UIComponent> listeners = pl.get(master);
if (listeners == null)
{
- listeners = new HashSet();
+ listeners = new HashSet<UIComponent>();
pl.put(master, listeners);
}
listeners.add(listener);
}
}
+ @Override
public void partialUpdateNotify(UIComponent updated)
{
if (updated != null)
@@ -487,7 +516,7 @@
/**
* Get the clientIds of all components that have requested partial update
*/
- public Iterator getPartialTargets()
+ public Iterator<String> getPartialTargets()
{
return _partialTargets.iterator();
}
@@ -497,21 +526,24 @@
* is listening on this component, it will add itself to the partialTargets
* list).
*/
- public Set getPartialUpdates()
+ public Set<String> getPartialUpdates()
{
return _partialTargets;
}
- public Map getColorPalette()
+ @Override
+ public Map<String, List<Color>> getColorPalette()
{
return ColorPaletteUtils.getColorPaletteMap();
}
- public Map getFormatter()
+ @Override
+ public Map<Object, Map<Object,String>> getFormatter()
{
return FormatterMap.sharedInstance();
}
+ @Override
public int getTwoDigitYearStart()
{
Integer twoDigitYearStart = (Integer) _bean.getProperty(
@@ -523,6 +555,7 @@
return 1950;
}
+ @Override
public Agent getAgent()
{
if (_agent == null)
@@ -559,17 +592,15 @@
private void _addTargets(Object key)
{
- Map pl = _getPartialListeners();
- Set listeners = (Set) pl.get(key);
+ Map<UIComponent, Set<UIComponent>> pl = _getPartialListeners();
+ Set<UIComponent> listeners = pl.get(key);
if (listeners != null)
{
// protect from infinite recursion
pl.remove(key);
- Iterator iter = listeners.iterator();
- while (iter.hasNext())
+ for(UIComponent listener : listeners)
{
- UIComponent listener = (UIComponent) iter.next();
addPartialTarget(listener);
// This target will be re-rendered, re-render anything that's
// listening on it also.
@@ -630,10 +661,10 @@
return null;
}
- private Map _getPartialListeners()
+ private Map<UIComponent, Set<UIComponent>> _getPartialListeners()
{
if (_partialListeners == null)
- _partialListeners = new HashMap();
+ _partialListeners = new HashMap<UIComponent, Set<UIComponent>>();
return _partialListeners;
}
@@ -641,8 +672,8 @@
private RequestContextBean _bean;
private HelpProvider _provider;
- private Map _partialListeners;
- private Set _partialTargets = new HashSet();
+ private Map<UIComponent, Set<UIComponent>> _partialListeners;
+ private Set<String> _partialTargets;
private Agent _agent;
private DialogServiceImpl _dialogService;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java Sun Aug 6 16:12:37 2006
@@ -58,6 +58,7 @@
context.getExternalContext().getRequestMap().remove(_POSTBACK_KEY);
}
+ @SuppressWarnings("unchecked")
public void afterPhase(PhaseEvent event)
{
if (event.getPhaseId() == PhaseId.RESTORE_VIEW)
@@ -83,6 +84,7 @@
}
}
+ @SuppressWarnings("unchecked")
public void beforePhase(PhaseEvent event)
{
// Ensure that the implicit object gets created. In general,
@@ -123,9 +125,10 @@
// Create the RequestContext if necessary; ideally, this is unnecessary
// because our filter will have executed - but if not, deal.
//
+ @SuppressWarnings("unchecked")
static private void _createContextIfNecessary(FacesContext fContext)
{
- Map requestMap = fContext.getExternalContext().getRequestMap();
+ Map<String, Object> requestMap = fContext.getExternalContext().getRequestMap();
Boolean createdContext = (Boolean)
requestMap.get(_CREATED_CONTEXT_KEY);
if (createdContext == null)
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/BaseConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/BaseConverter.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/BaseConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/BaseConverter.java Sun Aug 6 16:12:37 2006
@@ -15,9 +15,8 @@
*/
package org.apache.myfaces.trinidadinternal.convert;
-import java.util.Arrays;
+import java.util.ArrayList;
import java.util.Calendar;
-import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -27,7 +26,8 @@
{
}
- public Object convert(Object source, Class targetType)
+ @Override
+ public Object convert(Object source, Class<?> targetType)
{
if (source instanceof Calendar)
{
@@ -62,25 +62,36 @@
source.getClass() + " to:"+targetType);
}
- public List getTargetTypes(Class sourceType)
+ @SuppressWarnings("unchecked")
+ @Override
+ public List<Class<?>> getTargetTypes(Class<?> sourceType)
{
+ ArrayList<Class<?>> list = new ArrayList<Class<?>>(1);
if (Date.class.isAssignableFrom(sourceType))
{
- return Collections.singletonList(Calendar.class);
+ list.add(Calendar.class);
}
- if (Calendar.class.isAssignableFrom(sourceType))
+ else if (Calendar.class.isAssignableFrom(sourceType))
{
- return Collections.singletonList(Date.class);
+ list.add(Date.class);
}
- if (Number.class.isAssignableFrom(sourceType))
+ else if (Number.class.isAssignableFrom(sourceType))
{
- return Arrays.asList(new Class[] {
- Byte.class, Double.class, Float.class,
- Integer.class, Long.class, Short.class,
- Byte.TYPE, Double.TYPE, Float.TYPE, // bug 4891181
- Integer.TYPE, Long.TYPE, Short.TYPE}
- );
+ list.ensureCapacity(12);
+ list.add(Byte.class);
+ list.add(Double.class);
+ list.add(Float.class);
+ list.add(Integer.class);
+ list.add(Long.class);
+ list.add(Short.class);
+ list.add(Byte.TYPE);
+ list.add(Double.TYPE);
+ list.add(Float.TYPE); // bug 4891181
+ list.add(Integer.TYPE);
+ list.add(Long.TYPE);
+ list.add(Short.TYPE);
}
- return Collections.EMPTY_LIST;
+
+ return list;
}
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ByteConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ByteConverter.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ByteConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ByteConverter.java Sun Aug 6 16:12:37 2006
@@ -58,6 +58,7 @@
public static final String CONVERT_MESSAGE_ID =
"org.apache.myfaces.trinidad.convert.ByteConverter.CONVERT";
+ @Override
public Object getAsObject(
FacesContext context,
UIComponent component,
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java Sun Aug 6 16:12:37 2006
@@ -17,7 +17,6 @@
import java.util.Map;
-import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -43,6 +42,7 @@
}
+ @SuppressWarnings("unchecked")
public String getClientScript(FacesContext context, UIComponent component)
{
@@ -66,7 +66,9 @@
// FIX - figure out size!!!
StringBuffer buff = new StringBuffer();
- Map requestMap = context.getExternalContext().getRequestMap();
+ // -= Simon Lessard =-
+ // FIXME: JSF 1.2 specifies <String, Object>
+ Map<Object, Object> requestMap = context.getExternalContext().getRequestMap();
// =-=JRF Only if Javascript...
if (requestMap.get(_PATTERN_WRITTEN_KEY) == null)
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConvertException.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConvertException.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConvertException.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConvertException.java Sun Aug 6 16:12:37 2006
@@ -17,17 +17,17 @@
class ConvertException extends RuntimeException
{
- public ConvertException(Object source, Class targetType, Throwable error)
+ public ConvertException(Object source, Class<?> targetType, Throwable error)
{
super(_getMessage(source, targetType), error);
}
- public ConvertException(Object source, Class targetType)
+ public ConvertException(Object source, Class<?> targetType)
{
super(_getMessage(source, targetType));
}
- private static String _getMessage(Object source, Class targetType)
+ private static String _getMessage(Object source, Class<?> targetType)
{
return "Could not convert instance:"+source +
" of type:"+source.getClass()+" into type:"+targetType;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java Sun Aug 6 16:12:37 2006
@@ -149,7 +149,7 @@
*/
static public Converter createConverter(
FacesContext context,
- Class converterType)
+ Class<?> converterType)
{
// Don't bother for Strings and Objects; note that the 1.1_01 RI
// returns null, but the spec requires a FacesException, and MyFaces
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java Sun Aug 6 16:12:37 2006
@@ -66,6 +66,7 @@
super(pattern, secondaryPattern);
}
+ @Override
public String getAsString(FacesContext context, UIComponent component, Object value)
{
if (value == null)
@@ -81,6 +82,7 @@
}
+ @Override
public Object getAsObject(FacesContext context, UIComponent component, String value)
{
Object date = super.getAsObject(context, component, value);
@@ -107,7 +109,7 @@
ValueBinding binding = component.getValueBinding("value");
if (binding != null)
{
- Class expectedType = binding.getType(context);
+ Class<?> expectedType = binding.getType(context);
// Sometimes the type might be null, if it cannot be determined:
if ((expectedType != null) && (!expectedType.isAssignableFrom(value.getClass())))
{
@@ -132,6 +134,7 @@
return value;
}
+ @SuppressWarnings("unchecked")
public String getClientScript(FacesContext context, UIComponent component)
{
@@ -154,7 +157,9 @@
FormRenderer.addPatternMapping( clientId,
getExample(context));
// =-=AEW Only if Javascript...
- Map requestMap = context.getExternalContext().getRequestMap();
+ // -= Simon Lessard =-
+ // FIXME: JSF 1.2 specifies <String, Object>
+ Map<Object, Object> requestMap = context.getExternalContext().getRequestMap();
// this fetch could be at the place where we append, but has been
// moved ahead to optimize use of StringBuffer
@@ -305,6 +310,7 @@
return len;
}
+ @Override
protected Date getDate(FacesContext context, UIComponent component)
{
if (false)
@@ -339,6 +345,7 @@
* TimeZone names of Java, since these names are not available in
* client side JavaScript.
*/
+ @Override
protected TimeZone getFormattingTimeZone(TimeZone tZone)
{
TimeZone zone = (TimeZone)tZone.clone();
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DoubleConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DoubleConverter.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DoubleConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DoubleConverter.java Sun Aug 6 16:12:37 2006
@@ -34,6 +34,7 @@
public static final String CONVERT_MESSAGE_ID =
"org.apache.myfaces.trinidad.convert.DoubleConverter.CONVERT";
+ @Override
public Object getAsObject(
FacesContext context,
UIComponent component,
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/FloatConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/FloatConverter.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/FloatConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/FloatConverter.java Sun Aug 6 16:12:37 2006
@@ -34,6 +34,7 @@
public static final String CONVERT_MESSAGE_ID =
"org.apache.myfaces.trinidad.convert.FloatConverter.CONVERT";
+ @Override
public Object getAsObject(
FacesContext context,
UIComponent component,
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/GenericConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/GenericConverter.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/GenericConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/GenericConverter.java Sun Aug 6 16:12:37 2006
@@ -31,7 +31,7 @@
* targetType.
* @return an instance of the targetType.
*/
- public abstract Object convert(Object source, Class targetType);
+ public abstract Object convert(Object source, Class<?> targetType);
/**
* Gets all the supported targetTypes for the given sourceType.
@@ -40,5 +40,5 @@
* @return Each item is of type {@link Class}. An empty list must be
* returned if the given sourceType cannot be converted into anything.
*/
- public abstract List getTargetTypes(Class sourceType);
+ public abstract List<Class<?>> getTargetTypes(Class<?> sourceType);
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/GenericConverterFactory.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/GenericConverterFactory.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/GenericConverterFactory.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/GenericConverterFactory.java Sun Aug 6 16:12:37 2006
@@ -37,7 +37,8 @@
{
private GenericConverterFactory()
{
- _converters = new ArrayList(3);
+ _cache = new HashMap<Key, GenericConverter>(16);
+ _converters = new ArrayList<GenericConverter>(3);
registerConverter(new SqlConverter());
registerConverter(new BaseConverter());
}
@@ -55,7 +56,7 @@
* requests for the same source and target types will be fast.
* @return null if there is no such converter.
*/
- public GenericConverter getConverter(Class sourceType, Class targetType)
+ public GenericConverter getConverter(Class<?> sourceType, Class<?> targetType)
{
Key key = new Key(sourceType, targetType);
// check the cache first:
@@ -69,11 +70,11 @@
// can be used to perform this conversion.
// initial node in chain:
Node start = new Node(null, null, sourceType);
- LinkedList sourcesToBeSearched = new LinkedList();
+ LinkedList<Node> sourcesToBeSearched = new LinkedList<Node>();
sourcesToBeSearched.add(start);
// cache to store all the classes we've tested already. This is to
// avoid our chains from looping indefinitely:
- Set cache = new HashSet(16);
+ Set<Class<?>> cache = new HashSet<Class<?>>(16);
GenericConverter converter = _findConverter(sourcesToBeSearched, targetType, cache);
if (converter == null)
{
@@ -98,19 +99,19 @@
* @return null if no converter was found.
*/
private GenericConverter _findConverter(
- LinkedList sourcesToBeSearched,
- Class targetType,
- Set cache)
+ LinkedList<Node> sourcesToBeSearched,
+ Class<?> targetType,
+ Set<Class<?>> cache)
{
while(!sourcesToBeSearched.isEmpty())
{
- Node source = (Node) sourcesToBeSearched.removeFirst();
+ Node source = sourcesToBeSearched.removeFirst();
// loop through all the converters and see what types they can turn
// the current sourceType into
// (the current sourceType is source.targetType):
for(int j=0,jsz=_converters.size(); j<jsz; j++)
{
- GenericConverter conv = (GenericConverter) _converters.get(j);
+ GenericConverter conv = _converters.get(j);
// loop though all the targetTypes on this converter to see
// if we can find the one we're looking for:
if (_searchTargetTypes(sourcesToBeSearched, source, conv, targetType,
@@ -142,17 +143,17 @@
* currentSource.targetType into searchType.
*/
private boolean _searchTargetTypes(
- List sourcesToBeSearched,
+ List<Node> sourcesToBeSearched,
Node currentSource,
GenericConverter currentConverter,
- Class searchType,
- Set cache)
+ Class<?> searchType,
+ Set<Class<?>> cache)
{
- Class sourceType = currentSource.targetType;
- List targetTypes = currentConverter.getTargetTypes(sourceType);
+ Class<?> sourceType = currentSource.targetType;
+ List<Class<?>> targetTypes = currentConverter.getTargetTypes(sourceType);
for(int i=0,sz=targetTypes.size(); i<sz; i++)
{
- Class targetType = (Class) targetTypes.get(i);
+ Class<?> targetType = targetTypes.get(i);
// check to see if we've seen this targetType before:
if (cache.add(targetType))
{
@@ -188,7 +189,7 @@
* @param targetType the required type.
* @return null, if the source is null.
*/
- public Object convert(Object source, Class targetType)
+ public Object convert(Object source, Class<?> targetType)
{
if (source == null)
return null;
@@ -209,7 +210,7 @@
* into the specified targetType
* @return true if conversion is possible.
*/
- public boolean isConvertible(Object source, Class targetType)
+ public boolean isConvertible(Object source, Class<?> targetType)
{
if (source == null)
return false; // bug 4589048
@@ -221,13 +222,30 @@
return converter != null;
}
- private final Map _cache = new HashMap(16);
- private final List _converters;
- private static final Object _NULL = Node.class; // reuse an object
+ private final Map<Key, GenericConverter> _cache;
+ private final List<GenericConverter> _converters;
+ // 2006-08-02: -= Simon Lessard =-
+ // Using a GenericConverter null value instead
+ // of Node.class to be typesafe
+ private static final GenericConverter _NULL = new GenericConverter()
+ {
+ @Override
+ public Object convert(Object source, Class<?> targetType)
+ {
+ return null;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public List<Class<?>> getTargetTypes(Class<?> sourceType)
+ {
+ return Collections.EMPTY_LIST;
+ }
+ };
private static final class Node
{
- public Node(Node previous, GenericConverter converter, Class targetType)
+ public Node(Node previous, GenericConverter converter, Class<?> targetType)
{
this.previous = previous;
this.converter = converter;
@@ -244,7 +262,7 @@
return source;
}
- public Class getSourceType()
+ public Class<?> getSourceType()
{
if (previous == null)
return targetType;
@@ -253,12 +271,12 @@
public final Node previous;
public final GenericConverter converter;
- public final Class targetType;
+ public final Class<?> targetType;
}
private static final class Key
{
- public Key(Class source, Class target)
+ public Key(Class<?> source, Class<?> target)
{
assert !source.equals(target);
@@ -268,11 +286,13 @@
_hc = source.hashCode() + target.hashCode();
}
+ @Override
public int hashCode()
{
return _hc;
}
+ @Override
public boolean equals(Object other)
{
if (this == other)
@@ -286,18 +306,20 @@
}
private final int _hc;
- private final Class _source, _target;
+ private final Class<?> _source;
+ private final Class<?> _target;
}
private static final class CompositeConverter extends GenericConverter
{
- public CompositeConverter(Node source, GenericConverter conv, Class targetType)
+ public CompositeConverter(Node source, GenericConverter conv, Class<?> targetType)
{
assert source != null;
_chain = new Node(source, conv, targetType) ;
}
- public Object convert(Object source, Class targetType)
+ @Override
+ public Object convert(Object source, Class<?> targetType)
{
if (targetType.isAssignableFrom(_chain.targetType))
{
@@ -307,11 +329,15 @@
throw new IllegalArgumentException("Cannot convert to:"+targetType);
}
- public List getTargetTypes(Class sourceType)
+ @SuppressWarnings("unchecked")
+ @Override
+ public List<Class<?>> getTargetTypes(Class<?> sourceType)
{
if (_chain.getSourceType().isAssignableFrom(sourceType))
{
- return Collections.singletonList(_chain.targetType);
+ List<Class<?>> list = new ArrayList<Class<?>>(1);
+ list.add(_chain.targetType);
+ return list;
}
return Collections.EMPTY_LIST;
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/IntegerConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/IntegerConverter.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/IntegerConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/IntegerConverter.java Sun Aug 6 16:12:37 2006
@@ -62,6 +62,7 @@
+ @Override
public Object getAsObject(
FacesContext context,
UIComponent component,
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/LongConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/LongConverter.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/LongConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/LongConverter.java Sun Aug 6 16:12:37 2006
@@ -60,6 +60,7 @@
"org.apache.myfaces.trinidad.convert.LongConverter.CONVERT";
+ @Override
public Object getAsObject(
FacesContext context,
UIComponent component,
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/NumberConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/NumberConverter.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/NumberConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/NumberConverter.java Sun Aug 6 16:12:37 2006
@@ -25,6 +25,7 @@
{
}
+ @Override
public Object getAsObject(
FacesContext context,
UIComponent component,
@@ -41,6 +42,7 @@
return number;
}
+ @Override
public String getAsString(
FacesContext context,
UIComponent component,
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ShortConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ShortConverter.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ShortConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ShortConverter.java Sun Aug 6 16:12:37 2006
@@ -60,6 +60,7 @@
+ @Override
public Object getAsObject(
FacesContext context,
UIComponent component,
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/SqlConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/SqlConverter.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/SqlConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/SqlConverter.java Sun Aug 6 16:12:37 2006
@@ -19,7 +19,7 @@
import java.sql.Time;
import java.sql.Timestamp;
-import java.util.Arrays;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -32,7 +32,8 @@
{
}
- public Object convert(Object source, Class targetType)
+ @Override
+ public Object convert(Object source, Class<?> targetType)
{
java.util.Date jDate = (java.util.Date) source;
if (targetType.isAssignableFrom(Date.class))
@@ -50,16 +51,17 @@
throw new ConvertException(source, targetType);
}
- public List getTargetTypes(Class sourceType)
+ @SuppressWarnings("unchecked")
+ @Override
+ public List<Class<?>> getTargetTypes(Class<?> sourceType)
{
if (java.util.Date.class.isAssignableFrom(sourceType))
{
- Class[] types = new Class[] {
- Date.class,
- Time.class,
- Timestamp.class
- };
- return Arrays.asList(types);
+ List<Class<?>> list = new ArrayList<Class<?>>(3);
+ list.add(Date.class);
+ list.add(Time.class);
+ list.add(Timestamp.class);
+ return list;
}
return Collections.EMPTY_LIST;
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/FormatterMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/FormatterMap.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/FormatterMap.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/FormatterMap.java Sun Aug 6 16:12:37 2006
@@ -27,9 +27,9 @@
* <p>
* @author The Oracle ADF Faces Team
*/
-public class FormatterMap extends AbstractMap
+public class FormatterMap extends AbstractMap<Object, Map<Object,String>>
{
- static public Map sharedInstance()
+ static public Map<Object, Map<Object,String>> sharedInstance()
{
return _INSTANCE;
}
@@ -38,7 +38,9 @@
{
}
- public Object get(Object key)
+ @SuppressWarnings("unchecked")
+ @Override
+ public Map<Object,String> get(Object key)
{
if (key == null)
return Collections.EMPTY_MAP;
@@ -46,12 +48,14 @@
return new FunctorMap(key);
}
- public Set entrySet()
+ @SuppressWarnings("unchecked")
+ @Override
+ public Set<Map.Entry<Object, Map<Object,String>>> entrySet()
{
return Collections.EMPTY_SET;
}
- static private final class FunctorMap extends AbstractMap
+ static private final class FunctorMap extends AbstractMap<Object, String>
{
public FunctorMap(Object key)
{
@@ -59,12 +63,15 @@
_format = new FastMessageFormat(key.toString());
}
- public Object get(Object key)
+ @Override
+ public String get(Object key)
{
return _format.format(new Object[]{key});
}
- public Set entrySet()
+ @SuppressWarnings("unchecked")
+ @Override
+ public Set<Map.Entry<Object, String>> entrySet()
{
return Collections.EMPTY_SET;
}
@@ -73,5 +80,5 @@
}
- static private final Map _INSTANCE = new FormatterMap();
+ static private final Map<Object, Map<Object,String>> _INSTANCE = new FormatterMap();
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/HelpProvider.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/HelpProvider.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/HelpProvider.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/HelpProvider.java Sun Aug 6 16:12:37 2006
@@ -61,12 +61,12 @@
{
public static final String FRONT_PAGE_KEY = "frontPage";
- public Map getHelpTopicMap()
+ public Map<String, Object> getHelpTopicMap()
{
return _topicMap;
}
- public Map getHelpSystemMap()
+ public Map<String, Object> getHelpSystemMap()
{
return _systemMap;
}
@@ -99,33 +99,39 @@
*/
protected abstract Object getHelpSystemValue(Object key);
- private class HelpTopicMap extends AbstractMap
+ private class HelpTopicMap extends AbstractMap<String, Object>
{
- public Set entrySet()
+ @SuppressWarnings("unchecked")
+ @Override
+ public Set<Map.Entry<String, Object>> entrySet()
{
return Collections.EMPTY_SET;
}
+ @Override
public Object get(Object key)
{
return getHelpTopicValue(key);
}
}
- private class HelpSystemMap extends AbstractMap
+ private class HelpSystemMap extends AbstractMap<String, Object>
{
- public Set entrySet()
+ @SuppressWarnings("unchecked")
+ @Override
+ public Set<Map.Entry<String, Object>> entrySet()
{
return Collections.EMPTY_SET;
}
+ @Override
public Object get(Object key)
{
return getHelpSystemValue(key);
}
}
- private Map _topicMap = new HelpTopicMap();
- private Map _systemMap = new HelpSystemMap();
+ private Map<String, Object> _topicMap = new HelpTopicMap();
+ private Map<String, Object> _systemMap = new HelpSystemMap();
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/OracleHelpProvider.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/OracleHelpProvider.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/OracleHelpProvider.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/OracleHelpProvider.java Sun Aug 6 16:12:37 2006
@@ -67,7 +67,7 @@
}
_defaultOHWServletLocation = ohwServletLocation;
- _localeSpecificServlets = new OptimisticHashMap(13);
+ _localeSpecificServlets = new OptimisticHashMap<Locale, String>(13);
}
/**
@@ -101,6 +101,7 @@
* <p>
* @param key criterion (topic-id)
*/
+ @Override
protected String getHelpTopicURL(Object key)
{
String helpURL = null;
@@ -124,6 +125,7 @@
* <p>
* @param key criterion (HelpProvider key constant)
*/
+ @Override
protected String getHelpSystemURL(Object key)
{
if (HelpProvider.FRONT_PAGE_KEY.equals(key))
@@ -163,7 +165,7 @@
//not then check language/country and lang only locales
if (_localeSpecificServlets.containsKey(desiredLocale))
{
- servletLocation = (String) _localeSpecificServlets.get(desiredLocale);
+ servletLocation = _localeSpecificServlets.get(desiredLocale);
}
else
{
@@ -184,7 +186,7 @@
if (matchingLocale != null)
{
- servletLocation = (String)_localeSpecificServlets.get(matchingLocale);
+ servletLocation = _localeSpecificServlets.get(matchingLocale);
}
//cache the result of the search
@@ -197,6 +199,6 @@
private static final String _TOPIC_PARAM = "topic";
private static final String _LOCALE_PARAM = "locale";
private String _defaultOHWServletLocation = null;
- private OptimisticHashMap _localeSpecificServlets = null;
+ private OptimisticHashMap<Locale, String> _localeSpecificServlets = null;
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/SecondaryWindowHelpProvider.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/SecondaryWindowHelpProvider.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/SecondaryWindowHelpProvider.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/SecondaryWindowHelpProvider.java Sun Aug 6 16:12:37 2006
@@ -43,6 +43,7 @@
* <p>
* @param key criterion (topic-id)
*/
+ @Override
public Object getHelpTopicValue(Object key)
{
return _wrapURL(getHelpTopicURL(key));
@@ -55,6 +56,7 @@
* <p>
* @param key criterion (HelpProvider key constant)
*/
+ @Override
public Object getHelpSystemValue(Object key)
{
return _wrapURL(getHelpSystemURL(key));
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/Tokenizer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/Tokenizer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/Tokenizer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/Tokenizer.java Sun Aug 6 16:12:37 2006
@@ -22,7 +22,7 @@
* converts a EL expression into tokens.
* @author The Oracle ADF Faces Team
*/
-public class Tokenizer implements Iterator
+public class Tokenizer implements Iterator<Tokenizer.Token>
{
/**
* Creates a new Tokenizer
@@ -44,7 +44,7 @@
return _curToken != null;
}
- public Object next()
+ public Tokenizer.Token next()
{
if (_curToken == null)
throw new NoSuchElementException();
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/TrinidadVariableResolver.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/TrinidadVariableResolver.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/TrinidadVariableResolver.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/TrinidadVariableResolver.java Sun Aug 6 16:12:37 2006
@@ -34,6 +34,7 @@
_decorated = decorated;
}
+ @Override
public Object resolveVariable(FacesContext context, String name)
{
if (RequestContext.VARIABLE_NAME.equals(name))
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/ReturnActionListenerTag.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/ReturnActionListenerTag.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/ReturnActionListenerTag.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/ReturnActionListenerTag.java Sun Aug 6 16:12:37 2006
@@ -54,7 +54,7 @@
ValueExpression valueExp = _value.getValueExpression(faceletContext, Object.class);
ActionSource actionSource = (ActionSource)parent;
ReturnActionListener listener = new ReturnActionListener();
- listener.setValueBinding(listener.VALUE_KEY, new LegacyValueBinding(valueExp));
+ listener.setValueBinding(ReturnActionListener.VALUE_KEY, new LegacyValueBinding(valueExp));
actionSource.addActionListener(listener);
}
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/SetActionListenerTag.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/SetActionListenerTag.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/SetActionListenerTag.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/SetActionListenerTag.java Sun Aug 6 16:12:37 2006
@@ -56,9 +56,9 @@
Object.class);
ActionSource actionSource= (ActionSource) parent;
SetActionListener listener = new SetActionListener();
- listener.setValueBinding(listener.FROM_KEY,
+ listener.setValueBinding(SetActionListener.FROM_KEY,
new LegacyValueBinding(fromExpression));
- listener.setValueBinding(listener.TO_KEY,
+ listener.setValueBinding(SetActionListener.TO_KEY,
new LegacyValueBinding(toExpression));
actionSource.addActionListener(listener);
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/StringArrayPropertyTagRule.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/StringArrayPropertyTagRule.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/StringArrayPropertyTagRule.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/StringArrayPropertyTagRule.java Sun Aug 6 16:12:37 2006
@@ -45,6 +45,7 @@
_attribute = attribute;
}
+ @Override
public void applyMetadata(FaceletContext ctx, Object instance)
{
if (_params == null)
@@ -73,6 +74,7 @@
}
+ @Override
public Metadata applyRule(
String name,
TagAttribute attribute,
@@ -98,13 +100,15 @@
if (str == null)
return null;
- ArrayList list = new ArrayList();
+ ArrayList<String> list = new ArrayList<String>();
StringTokenizer tokens = new StringTokenizer(str);
while (tokens.hasMoreTokens())
+ {
list.add(tokens.nextToken());
- String[] strArray = new String[list.size()];
- return (String[]) list.toArray(strArray);
+ }
+
+ return list.toArray(new String[list.size()]);
}
- static private final Class _STRING_ARRAY_TYPE = (new String[0]).getClass();
+ static private final Class<? extends String[]> _STRING_ARRAY_TYPE = (new String[0]).getClass();
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadComponentHandler.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadComponentHandler.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadComponentHandler.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadComponentHandler.java Sun Aug 6 16:12:37 2006
@@ -57,6 +57,8 @@
}
}
+ @SuppressWarnings("unchecked")
+ @Override
protected MetaRuleset createMetaRuleset(Class type)
{
MetaRuleset m = super.createMetaRuleset(type);
@@ -67,6 +69,7 @@
return m;
}
+ @Override
protected void onComponentPopulated(FaceletContext context,
UIComponent component,
UIComponent parent)
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadListenersTagRule.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadListenersTagRule.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadListenersTagRule.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadListenersTagRule.java Sun Aug 6 16:12:37 2006
@@ -48,6 +48,7 @@
_paramList = paramList;
}
+ @Override
public void applyMetadata(FaceletContext ctx, Object instance)
{
MethodExpression expr =
@@ -74,6 +75,7 @@
}
+ @Override
public Metadata applyRule(
String name,
TagAttribute attribute,
@@ -92,17 +94,17 @@
return null;
// It should return an array of FooListener objects
- Class arrayType = listeners.getPropertyType();
+ Class<?> arrayType = listeners.getPropertyType();
if (!arrayType.isArray())
return null;
// Ignore non-ADF types
- Class listenerClass = arrayType.getComponentType();
+ Class<?> listenerClass = arrayType.getComponentType();
if (!listenerClass.getName().startsWith("org.apache.myfaces.trinidad."))
return null;
// Turn that into an Event to get the signature
- Class eventClass = _getEventClass(listenerClass);
+ Class<?> eventClass = _getEventClass(listenerClass);
if (eventClass == null)
return null;
@@ -114,7 +116,7 @@
return null;
}
- static private Class _getEventClass(Class listenerClass)
+ static private Class<?> _getEventClass(Class<?> listenerClass)
{
String listenerName = listenerClass.getName();
if (!listenerName.endsWith("Listener"))
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/AbstractImageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/AbstractImageRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/AbstractImageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/AbstractImageRenderer.java Sun Aug 6 16:12:37 2006
@@ -42,8 +42,8 @@
*/
abstract public Image renderImage(
ImageContext context,
- Map requestedProperties,
- Map responseProperties
+ Map<Object, Object> requestedProperties,
+ Map<Object, Object> responseProperties
);
/**
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageProviderRequest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageProviderRequest.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageProviderRequest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageProviderRequest.java Sun Aug 6 16:12:37 2006
@@ -50,5 +50,5 @@
* @see ImageRenderer
* @see ImageConstants
*/
- public Map getRenderProperties(ImageContext context);
+ public Map<Object, Object> getRenderProperties(ImageContext context);
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageProviderRequestImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageProviderRequestImpl.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageProviderRequestImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageProviderRequestImpl.java Sun Aug 6 16:12:37 2006
@@ -38,7 +38,7 @@
public ImageProviderRequestImpl(
String namespaceURI,
String name,
- Map renderProperties)
+ Map<Object, Object> renderProperties)
{
if (namespaceURI == null)
{
@@ -74,12 +74,12 @@
/**
* Implementation of ImageProviderRequest.getRenderProperties().
*/
- public Map getRenderProperties(ImageContext context)
+ public Map<Object, Object> getRenderProperties(ImageContext context)
{
return _properties;
}
private String _namespace;
private String _name;
- private Map _properties;
+ private Map<Object, Object> _properties;
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageProviderResponse.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageProviderResponse.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageProviderResponse.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageProviderResponse.java Sun Aug 6 16:12:37 2006
@@ -17,6 +17,8 @@
package org.apache.myfaces.trinidadinternal.image;
import java.util.Collection;
+import org.apache.myfaces.trinidadinternal.image.util.MapArea;
+
/**
* ImageProviderResponse objects are returned by the ImageProvider
@@ -62,5 +64,5 @@
*
* @see org.apache.myfaces.trinidadinternal.image.util.MapArea
*/
- public Collection getMapAreas();
+ public Collection<MapArea> getMapAreas();
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageRenderer.java Sun Aug 6 16:12:37 2006
@@ -50,7 +50,7 @@
*/
public Image renderImage(
ImageContext context,
- Map requestedProperties,
- Map responseProperties
+ Map<Object, Object> requestedProperties,
+ Map<Object, Object> responseProperties
);
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageTypeImpl.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageTypeImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageTypeImpl.java Sun Aug 6 16:12:37 2006
@@ -17,8 +17,6 @@
package org.apache.myfaces.trinidadinternal.image;
import java.util.Map;
-import java.util.Iterator;
-
import org.apache.myfaces.trinidad.util.ArrayMap;
@@ -33,10 +31,11 @@
public ImageTypeImpl(
String namespaceURI,
String name,
- Map properties)
+ Map<Object, Object> properties)
{
_namespace = namespaceURI;
_name = name;
+ _properties = new ArrayMap<Object, Object>();
setProperties(properties);
}
@@ -105,21 +104,18 @@
* This method is not defined on ImageType or MutableImageType -
* it is provided as a convenience for ImageTypeManager.
*/
- public void setProperties(Map properties)
+ public void setProperties(Map<Object, Object> properties)
{
if (properties == null)
return;
-
- Iterator keys = properties.keySet().iterator();
- while (keys.hasNext())
+
+ for(Map.Entry<Object, Object> entry : properties.entrySet())
{
- Object key = keys.next();
- Object value = properties.get(key);
-
- setProperty(key, value);
+ setProperty(entry.getKey(), entry.getValue());
}
}
+ @Override
public String toString()
{
return getClass().getName() + "[" + _namespace + ", " + _name + "]";
@@ -127,5 +123,5 @@
private String _namespace;
private String _name;
- private ArrayMap _properties = new ArrayMap();
+ private ArrayMap<Object, Object> _properties;
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageTypeManager.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageTypeManager.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageTypeManager.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageTypeManager.java Sun Aug 6 16:12:37 2006
@@ -93,7 +93,7 @@
synchronized public ImageType registerImageType(
String namespace,
String name,
- Map properties
+ Map<Object, Object> properties
)
{
ImageType type = getImageType(namespace, name);
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/PainterImageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/PainterImageRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/PainterImageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/PainterImageRenderer.java Sun Aug 6 16:12:37 2006
@@ -83,10 +83,11 @@
* properties that describe what to render. A PaintContext
* object is created using the given Map of properties.
*/
+ @Override
public Image renderImage(
ImageContext imageContext,
- Map requestedProperties,
- Map responseProperties
+ Map<Object, Object> requestedProperties,
+ Map<Object, Object> responseProperties
)
{
if (!isRenderable(imageContext, requestedProperties))
@@ -155,7 +156,7 @@
*/
protected Painter getPainter(
ImageContext imageContext,
- Map requestedProperties
+ Map<Object, Object> requestedProperties
)
{
return getPainter();
@@ -173,7 +174,7 @@
*/
protected boolean isRenderable(
ImageContext imageContext,
- Map requestedProperties
+ Map<Object, Object> requestedProperties
)
{
return GraphicsUtils.isGraphicalEnvironment();
@@ -183,7 +184,9 @@
* Returns the foreground color to use when painting an image
* with the specified Map.
*/
- protected Color getPaintForeground(ImageContext context, Map d)
+ protected Color getPaintForeground(
+ ImageContext context,
+ Map<Object,Object> d)
{
return (Color)d.get(FOREGROUND_KEY);
}
@@ -192,7 +195,9 @@
* Returns the background color to use when painting an image
* with the specified Map.
*/
- protected Color getPaintBackground(ImageContext context, Map d)
+ protected Color getPaintBackground(
+ ImageContext context,
+ Map<Object,Object> d)
{
return (Color)d.get(BACKGROUND_KEY);
}
@@ -201,7 +206,7 @@
* Returns the font color to use when painting an image
* with the specified Map.
*/
- protected Font getPaintFont(Map d)
+ protected Font getPaintFont(Map<Object,Object> d)
{
Object o = d.get(FONT_KEY);
@@ -211,7 +216,7 @@
return (Font)d.get(FONT_KEY);
}
- protected Object getPaintData(Object key, Map d)
+ protected Object getPaintData(Object key, Map<Object,Object> d)
{
return d.get(key);
}
@@ -223,8 +228,8 @@
protected PaintContext createPaintContext(
ImageContext imageContext,
BufferedImage image,
- Map requestedProperties,
- Map responseProperties
+ Map<Object,Object> requestedProperties,
+ Map<Object,Object> responseProperties
)
{
return
@@ -250,8 +255,8 @@
public Context(
ImageContext imageContext,
BufferedImage image,
- Map requestedProperties,
- Map responseProperties
+ Map<Object,Object> requestedProperties,
+ Map<Object,Object> responseProperties
)
{
@@ -395,8 +400,8 @@
private Graphics2D _graphics;
private ImageContext _imageContext;
- private Map _requested;
- private Map _response;
+ private Map<Object,Object> _requested;
+ private Map<Object,Object> _response;
private int _direction;
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/PropertyInstantiator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/PropertyInstantiator.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/PropertyInstantiator.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/PropertyInstantiator.java Sun Aug 6 16:12:37 2006
@@ -46,7 +46,7 @@
{
try
{
- Class classInstance = ClassLoaderUtils.loadClass(_className);
+ Class<?> classInstance = ClassLoaderUtils.loadClass(_className);
return classInstance.newInstance();
}
catch (ClassNotFoundException cnfe)
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/AccentColorizedIconKey.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/AccentColorizedIconKey.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/AccentColorizedIconKey.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/AccentColorizedIconKey.java Sun Aug 6 16:12:37 2006
@@ -36,7 +36,7 @@
*/
public AccentColorizedIconKey(
ImageContext context,
- Map properties
+ Map<Object, Object> properties
)
{
super(context, properties);
@@ -47,11 +47,11 @@
*/
protected AccentColorizedIconKey(
ImageContext context,
- String source,
- Class lookAndFeel,
- int direction,
- Color color,
- Color surroundingColor)
+ String source,
+ Class<?> lookAndFeel,
+ int direction,
+ Color color,
+ Color surroundingColor)
{
super(context, source, lookAndFeel, direction, color, surroundingColor);
}
@@ -62,6 +62,7 @@
* @deprecated in favor of
* {@link #AccentColorizedIconKey( ImageContext, String, Class, int, Color, Color)}
*/
+ @Deprecated
protected AccentColorizedIconKey(
ImageContext context,
String source,
@@ -83,6 +84,7 @@
* Returns the color key for accent colorized icons:
* ImageConstants.DARK_ACCENT_COLOR_KEY.
*/
+ @Override
public Object getColorKey()
{
return ImageConstants.DARK_ACCENT_COLOR_KEY;