Attachment #97323 for bug #186459

Lines 35-41 Link Here

(-)src/org/eclipse/jst/pagedesigner/jsp/core/JSPCorePlugin.java (-1 / +1 lines)
35	plugin = this;	35	plugin = this;
36	try {	36	try {
37	resourceBundle = ResourceBundle	37	resourceBundle = ResourceBundle
38	.getBundle("org.eclipse.jst.pagedesigner.jsp.core.JSPCorePluginResources");	38	.getBundle("org.eclipse.jst.pagedesigner.jsp.core.JSPCorePluginResources"); //$NON-NLS-1$
39	} catch (MissingResourceException x) {	39	} catch (MissingResourceException x) {
40	resourceBundle = null;	40	resourceBundle = null;
41	}	41	}




 * @author mengbo
 */
public final class PropertyUtils {

	private static final String ENCODED_CHAR_PERCENT = "%25"; //$NON-NLS-1$
	private static final String ENCODED_CHAR_CARRIAGE_RETURN = "%0d"; //$NON-NLS-1$
	private static final String ENCODED_CHAR_TAB = "%09"; //$NON-NLS-1$
	private static final String ENCODED_CHAR_NEWLINE = "%0a"; //$NON-NLS-1$
	private static final String ENCODED_CHAR_SPACE = "%20"; //$NON-NLS-1$
	private static final String ENCODED_CHAR_COLON = "%3a"; //$NON-NLS-1$
	private static final String ENCODED_CHAR_EQUALS = "%3d"; //$NON-NLS-1$

	
	// WARNING: There can be NO static logging line here since the logger uses
	// this class to figure out the preferences
	// for the logging system. "Logging" an error here would be useless since

			switch (ch) {
			// these are the set of illegal characters in a Property name
			case '=': // %3d
				encoded.append(ENCODED_CHAR_EQUALS);
				break;
			case ':': // %3a
				encoded.append(ENCODED_CHAR_COLON);
				break;
			case ' ': // %20
				encoded.append(ENCODED_CHAR_SPACE);
				break;
			case '\n': // %0a
				encoded.append(ENCODED_CHAR_NEWLINE);
				break;
			case '\t': // %09
				encoded.append(ENCODED_CHAR_TAB);
				break;
			case '\r': // %0d
				encoded.append(ENCODED_CHAR_CARRIAGE_RETURN);
				break;
			case '%': // %25
				// added because its our encoding flag
				encoded.append(ENCODED_CHAR_PERCENT);
				break;
			default:
				encoded.append(ch);




 * @author mengbo
 */
public abstract class ResourceUtils {
	private static final String LOG_RESOURCE_UTILS_MSG_KEY = "log.ResourceUtils"; //$NON-NLS-1$
	private static Logger _log = JSFUICommonPlugin.getLogger(ResourceUtils.class);
	/**
	 * the resource bundle accessible by all children

		_resources = resource;
		if (_resources == null) {
			// log.ResourceUtils=Missing Resource Bundle "{0}".
			_log.error(LOG_RESOURCE_UTILS_MSG_KEY, bundleLocation);
			// pluginName=Web Application Development Common
			JSFUICommonPlugin.getAlerts().error("pluginName", LOG_RESOURCE_UTILS_MSG_KEY, //$NON-NLS-1$
					bundleLocation);
		}
	}

	 * @return true if there is a resource corresponding to key
	 */
	public boolean isResource(String key) {
		return getString(key).equals("" + true); //$NON-NLS-1$
	}

	/**




	private static Logger _log = JSFUICommonPlugin
			.getLogger(FavoriteConfigurations.class);

	private final static String FAV_EXTENSIONS = ".xml"; //$NON-NLS-1$

	private final static String ELEMENT_ROOT = "favorite"; //$NON-NLS-1$

	private final static String ELEMENT_CONFIG = "config"; //$NON-NLS-1$

	private final static String ELEMENT_NAME = "name"; //$NON-NLS-1$

	private final static String ELEMENT_PROPERTY = "property"; //$NON-NLS-1$

	private final static String ELEMENT_VALUE = "value"; //$NON-NLS-1$

	private Map _favorites;


		} catch (Exception ee) {
			// log.FavoriteConfigurations.save.error=Failed to save {0}
			// favorites. File={1}
			_log.info("log.FavoriteConfigurations.save.error", _favoriteName, //$NON-NLS-1$
					_favoriteFile.toOSString(), ee);
		} finally {
			if (fw != null) {

		} catch (Exception ee) {
			// log.FavoriteConfigurations.read.error=Failed to save {0}
			// favorites. File={1}
			_log.error("log.FavoriteConfigurations.read.error", _favoriteName, //$NON-NLS-1$
					_favoriteFile.toOSString(), ee);
		} finally {
			if (fr != null) {

Lines 40-46 Link Here

(-)src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringButtonDialogField.java (-1 / +1 lines)
40	public StringButtonDialogField(IStringButtonAdapter adapter) {	40	public StringButtonDialogField(IStringButtonAdapter adapter) {
41	_stringButtonAdapter = adapter;	41	_stringButtonAdapter = adapter;
42	_browseButtonLabel = JSFUICommonPlugin	42	_browseButtonLabel = JSFUICommonPlugin
43	.getResourceString("DialogField.Browse");	43	.getResourceString("DialogField.Browse"); //$NON-NLS-1$
44	_buttonEnabled = true;	44	_buttonEnabled = true;
45	}	45	}
46		46

Lines 175-181 Link Here

(-)src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ColorButtonDialogField.java (-1 / +1 lines)
175	if (_button == null) {	175	if (_button == null) {
176	assertCompositeNotNull(parent);	176	assertCompositeNotNull(parent);
177	if (toolkit != null) {	177	if (toolkit != null) {
178	_button = toolkit.createButton(parent, "", SWT.PUSH);	178	_button = toolkit.createButton(parent, "", SWT.PUSH); //$NON-NLS-1$
179	} else {	179	} else {
180	_button = new Button(parent, SWT.PUSH);	180	_button = new Button(parent, SWT.PUSH);
181	}	181	}





			if (toolkit != null) {
				if (_numRows <= 1) {
					_textControl = toolkit.createText(parent, ""); //$NON-NLS-1$
				} else {
					_textControl = toolkit.createText(parent, "", SWT.V_SCROLL); //$NON-NLS-1$
				}
			} else {
				if (_numRows <= 1) {

		_pending = false;

		if (text == null)
			text = ""; //$NON-NLS-1$
		_text = text;
		if (isOkToUse(_textControl)) {
			_textControl.removeModifyListener(_modifyListener);

Lines 87-96 Link Here

(-)src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/AbstractClassButtonDialogField.java (-3 / +3 lines)
87	try {	87	try {
88	if (_project == null \|\| !_project.hasNature(JavaCore.NATURE_ID)) {	88	if (_project == null \|\| !_project.hasNature(JavaCore.NATURE_ID)) {
89	ResourceBundle rb = ResourceBundle	89	ResourceBundle rb = ResourceBundle
90	.getBundle("org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldResources");	90	.getBundle("org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldResources"); //$NON-NLS-1$
91	Alerts alerts = new Alerts(JSFUICommonPlugin.getDefault(), rb);	91	Alerts alerts = new Alerts(JSFUICommonPlugin.getDefault(), rb);
92	alerts.error("ClassButtonDialogField.Alert.Title",	92	alerts.error("ClassButtonDialogField.Alert.Title", //$NON-NLS-1$
93	"ClassButtonDialogField.Alert.Msg");	93	"ClassButtonDialogField.Alert.Msg"); //$NON-NLS-1$
94	return;	94	return;
95	}	95	}
96	} catch (CoreException e) {	96	} catch (CoreException e) {

Lines 66-75 Link Here

(-)src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/SourceFolderButtonDialogField.java (-2 / +2 lines)
66	_project = project;	66	_project = project;
67		67
68	setLabelText(DialogFieldResources.getInstance().getString(	68	setLabelText(DialogFieldResources.getInstance().getString(
69	"SourceFolderButtonDialogField.container.label"));	69	"SourceFolderButtonDialogField.container.label")); //$NON-NLS-1$
70		70
71	setButtonLabel(DialogFieldResources.getInstance().getString(	71	setButtonLabel(DialogFieldResources.getInstance().getString(
72	"SourceFolderButtonDialogField.container.button"));	72	"SourceFolderButtonDialogField.container.button")); //$NON-NLS-1$
73		73
74	setStringButtonAdapter(new IStringButtonAdapter() {	74	setStringButtonAdapter(new IStringButtonAdapter() {
75	public void changeControlPressed(DialogField field) {	75	public void changeControlPressed(DialogField field) {




 */
public class JSFUICommonPlugin extends AbstractUIPlugin {
	// Properties contains general properties and defaults to preferences.
	private static final String PROPERTIES = "default.properties"; //$NON-NLS-1$
	// preferences will
	// contain this string
	// in the key.

	private static final String P_CONSOLE_LOGGING = "console.logging.on"; //$NON-NLS-1$

	private static final String P_CONSOLE_LOG_LEVEL = "console.logging.max.level"; //$NON-NLS-1$

	private static final String P_ECLIPSE_LOGGING = "eclipse.logging.on"; //$NON-NLS-1$

	private static final String P_ECLIPSE_LOG_LEVEL = "eclipse.logging.max.level"; //$NON-NLS-1$

	private static final String P_FILE_LOGGING = "file.logging.on"; //$NON-NLS-1$

	private static final String P_FILE_LOG_LEVEL = "file.logging.max.level"; //$NON-NLS-1$

	private static final String P_FILE_PATH = "file.logging.path"; //$NON-NLS-1$

	private static final String P_FILE_CLEAR = "file.logging.startup.clear"; //$NON-NLS-1$

	private static final String P_FILE_ROLLOVER_FREQUENCY = "file.logging.rollover.frequency"; //$NON-NLS-1$

	private static final int DEBUG_LEVEL = 0;


		if (isThreeDot() == false) {
			throw new CoreException(new Status(IStatus.ERROR, getBundle()
					.getSymbolicName(), IStatus.OK,
					"Requires eclipse version 3.x", null)); //$NON-NLS-1$
		}

		try {
			// get resource bundle.
			_resourceBundle = ResourceBundle
					.getBundle("org.eclipse.jst.jsf.common.ui.CommonResources"); //$NON-NLS-1$
			_alerts = new Alerts(this, _resourceBundle);

			// get properties.
			_properties = new Properties();
			InputStream input = null;
			_pluginBase = getBundle().getEntry("/"); //$NON-NLS-1$
			try {
				input = (new URL(_pluginBase, PROPERTIES)).openStream();
				_properties.load(input);

			if (_log != null) {
				_log
						.error(
								"log.msg", //$NON-NLS-1$
								"Problems starting plug-in Web Application Development Common.", //$NON-NLS-1$
								ee);
			}


							IStatus.ERROR,
							getBundle().getSymbolicName(),
							IStatus.OK,
							"Problems starting plug-in Web Application Development Common", //$NON-NLS-1$
							ee));
		}
	}

		if (image == null) {
			try {
				ImageDescriptor id = ImageDescriptor.createFromURL(new URL(
						_pluginBase, "icons/" + name)); //$NON-NLS-1$
				images.put(name, id);

				image = images.get(name);
			} catch (MalformedURLException ee) {
				// log.CommonPlugin.image.error=Image {0} not found.
				_log.error("log.msg", "log.CommonPlugin.image.error", name, ee); //$NON-NLS-1$ //$NON-NLS-2$
			}
		}
		return image;

		if (id == null) {
			try {
				id = ImageDescriptor.createFromURL(new URL(_pluginBase,
						"icons/" + name)); //$NON-NLS-1$
				images.put(name, id);
			} catch (MalformedURLException ee) {
				// log.CommonPlugin.image.error=Image {0} not found.
				_log.error("log.msg", "log.CommonPlugin.image.error", name, ee); //$NON-NLS-1$ //$NON-NLS-2$
			}
		}
		return id;

		store.setDefault(P_CONSOLE_LOGGING, _properties.getProperty(
				P_CONSOLE_LOGGING, Boolean.TRUE.toString()));
		store.setDefault(P_CONSOLE_LOG_LEVEL, strToIntLogLevel(_properties
				.getProperty(P_CONSOLE_LOG_LEVEL, "ERROR"))); //$NON-NLS-1$

		store.setDefault(P_ECLIPSE_LOGGING, _properties.getProperty(
				P_ECLIPSE_LOGGING, Boolean.TRUE.toString()));
		store.setDefault(P_ECLIPSE_LOG_LEVEL, strToIntLogLevel(_properties
				.getProperty(P_ECLIPSE_LOG_LEVEL, "ERROR"))); //$NON-NLS-1$

		store.setDefault(P_FILE_LOGGING, _properties.getProperty(
				P_FILE_LOGGING, Boolean.FALSE.toString()));
		store.setDefault(P_FILE_LOG_LEVEL, strToIntLogLevel(_properties
				.getProperty(P_FILE_LOG_LEVEL, "ERROR"))); //$NON-NLS-1$
		store.setDefault(P_FILE_PATH, _properties.getProperty(P_FILE_PATH, "")); //$NON-NLS-1$
		store.setDefault(P_FILE_CLEAR, _properties.getProperty(P_FILE_CLEAR,
				Boolean.TRUE.toString()));
		store.setDefault(P_FILE_ROLLOVER_FREQUENCY, _properties.getProperty(
				P_FILE_ROLLOVER_FREQUENCY, "DAILY")); //$NON-NLS-1$
	}

	/**

		if (str == null) {
			return ERROR_LEVEL;
		}
		if (str.equalsIgnoreCase("DEBUG")) { //$NON-NLS-1$
			return DEBUG_LEVEL;
		}
		if (str.equalsIgnoreCase("INFO")) { //$NON-NLS-1$
			return INFO_LEVEL;
		}
		if (str.equalsIgnoreCase("WARN")) { //$NON-NLS-1$
			return WARN_LEVEL;
		}
		if (str.equalsIgnoreCase("FATAL")) { //$NON-NLS-1$
			return FATAL_LEVEL;
		}
		return ERROR_LEVEL;




	/**
	 * the dot character
	 */
	public static final String DOT = "."; //$NON-NLS-1$

	/**
	 * the path separator
	 */
	public static final String PATH_SEPARATOR = "/"; //$NON-NLS-1$

	/** file extensions */
	/**
	 * class file extension
	 */
	public static final String EXT_CLASS = "class"; //$NON-NLS-1$

	/**
	 * jar file extension
	 */
	public static final String EXT_JAR = "jar"; //$NON-NLS-1$

	/**
	 * java file extension
	 */
	public static final String EXT_JAVA = "java"; //$NON-NLS-1$


	/**
	 * jsp file extension
	 */
	public static final String EXT_JSP = "jsp"; //$NON-NLS-1$

	/**
	 * properties file extension
	 */
	public static final String EXT_PROPERTIES = "properties"; //$NON-NLS-1$

	/**
	 * taglib file extension
	 */
	public static final String EXT_TAGLIB = "tld"; //$NON-NLS-1$

	/**
	 * standard web.xml file name
	 */
	public static final String FILE_WEB_XML = "web.xml"; //$NON-NLS-1$

	/** folders */

	/**
	 * classes folder name
	 */
	public static final String FOLDER_CLASS = "classes"; //$NON-NLS-1$

	/**
	 * icons folder name
	 */
	public static final String FOLDER_ICONS = "icons"; //$NON-NLS-1$

	/**
	 * the meta-inf folder name
	 */
	public static final String FOLDER_METAINF = "META-INF"; //$NON-NLS-1$

	/**
	 * the src folder name
	 */
	public static final String FOLDER_SOURCE = "src"; //$NON-NLS-1$

	/**
	 * the web-inf folder name
	 */
	public static final String FOLDER_WEBINF = "WEB-INF"; //$NON-NLS-1$

	/** the webroot folder depth relative to the project */
	public static final int WEBROOT_FOLDER_DEPTH = 2;




    protected UIFormInfo(final ComponentInfo parent, ComponentTypeInfo componentTypeInfo,
            Map attributes)
    {
        this(getStringProperty("id", attributes, true), //$NON-NLS-1$
                parent,
                componentTypeInfo,
                getBooleanProperty("rendered", attributes), //$NON-NLS-1$
                getBooleanProperty("prependId", attributes), //$NON-NLS-1$
                getBooleanProperty("submitted", attributes)); //$NON-NLS-1$
    }
    
    /**


    protected String getMostSpecificComponentName()
    {
        return "UIForm"; //$NON-NLS-1$
    } 
}




    protected UIInputInfo(final ComponentInfo parent,
            final ComponentTypeInfo typeInfo, Map attributes)
    {
        this(getStringProperty("id", attributes, true), parent, typeInfo, //$NON-NLS-1$
                getEditableValueHolderInfo("$editableValueHolderInfo", //$NON-NLS-1$
                        attributes), getBooleanProperty("rendered", attributes)); //$NON-NLS-1$
    }

    private static IEditableValueHolderInfo getEditableValueHolderInfo(

    // @Override
    protected String getMostSpecificComponentName()
    {
        return "UIInput"; //$NON-NLS-1$
    }

    public final boolean isValid()




    /**
     * Base class name for UIInput's
     */
    public final static String BASE_CLASS_UIINPUT = "javax.faces.component.UIInput"; //$NON-NLS-1$
    /**
     * Base class name for UIOutput's
     */
    public final static String BASE_CLASS_UIOUTPUT = "javax.faces.component.UIOutput"; //$NON-NLS-1$
    /**
     * Base class name for UICommand's
     */
    public final static String BASE_CLASS_UICOMMAND = "javax.faces.component.UICommand"; //$NON-NLS-1$
    /**
     * Base class name for UIData's
     */
    public final static String BASE_CLASS_UIDATA = "javax.faces.component.UIData"; //$NON-NLS-1$
    /**
     * Base class name for UIForm's
     */
    public final static String BASE_CLASS_UIFORM = "javax.faces.component.UIForm"; //$NON-NLS-1$

    /**
     * Interface name for ValueHolder's
     */
    public final static String INTERFACE_VALUEHOLDER = "javax.faces.component.ValueHolder"; //$NON-NLS-1$
    /**
     * Interface name for EditableValueHolder's
     */
    public final static String INTERFACE_EDITABLEVALUEHOLDER = "javax.faces.component.EditableValueHolder"; //$NON-NLS-1$
    /**
     * Interface name for ActionSource's
     */
    public final static String INTERFACE_ACTIONSOURCE = "javax.faces.component.ActionSource"; //$NON-NLS-1$
    /**
     * Interface name for ActionSource2's
     */
    public final static String INTERFACE_ACTIONSOURCE2 = "javax.faces.component.ActionSource2"; //$NON-NLS-1$
    /**
     * Interface name for NamingContainer's
     */
    public final static String INTERFACE_NAMINGCONTAINER = "javax.faces.component.NamingContainer"; //$NON-NLS-1$

    /**
     * @param id

     */
    public static void maybeDefaultRendered(final Map attributes)
    {
        if (!(attributes.get("rendered") instanceof Boolean)) //$NON-NLS-1$
        {
            attributes.put("rendered", Boolean.TRUE); //$NON-NLS-1$
        }
    }



    private static void maybeDefaultSubmitted(Map attributes)
    {
        if (!(attributes.get("submitted") instanceof Boolean)) //$NON-NLS-1$
        {
            attributes.put("submitted", Boolean.FALSE); //$NON-NLS-1$
        }
    }

    private static void maybeDefaultPrependId(Map attributes)
    {
        if (!(attributes.get("prependId") instanceof Boolean)) //$NON-NLS-1$
        {
            attributes.put("prependId", Boolean.FALSE); //$NON-NLS-1$
        }
    }



    private static void maybeDefaultFirst(Map attributes)
    {
        if (!(attributes.get("first") instanceof Integer)) //$NON-NLS-1$
        {
            attributes.put("first", ZERO); //$NON-NLS-1$
        }
    }

    private static void maybeDefaultRowCount(Map attributes)
    {
        if (!(attributes.get("rowCount") instanceof Integer)) //$NON-NLS-1$
        {
            attributes.put("rowCount", MINUS_ONE); //$NON-NLS-1$
        }
    }

    private static void maybeDefaultRowAvailable(Map attributes)
    {
        if (! (attributes.get("rowAvailable") instanceof Boolean)) //$NON-NLS-1$
        {
            attributes.put("rowAvailable", Boolean.FALSE); //$NON-NLS-1$
        }
    }

    private static void maybeDefaultRowIndex(Map attributes)
    {
        if (! (attributes.get("rowIndex") instanceof Integer)) //$NON-NLS-1$
        {
            attributes.put("rowIndex", MINUS_ONE); //$NON-NLS-1$
        }
    }

    private static void maybeDefaultRows(Map attributes)
    {
        if (! (attributes.get("rows") instanceof Integer)) //$NON-NLS-1$
        {
            attributes.put("rows", ZERO); //$NON-NLS-1$
        }
    }

    private static void maybeDefaultVar(Map attributes)
    {
        if (! (attributes.get("var") instanceof String)) //$NON-NLS-1$
        {
            attributes.put("var", "** default variable **"); //$NON-NLS-1$ //$NON-NLS-2$
        }
    }
}




    /**
     * the standard name for the footer facet
     */
    public final static String FACET_NAME_FOOTER = "footer"; //$NON-NLS-1$
    /**
     * the standard name for the header facet.
     */
    public final static String FACET_NAME_HEADER = "header"; //$NON-NLS-1$
    /**
     * serialization id
     */

    public UIDataInfo(final ComponentInfo parent,
            final ComponentTypeInfo componentTypeInfo, Map attributes)
    {
        this(getStringProperty("id", attributes, true), parent, //$NON-NLS-1$
                componentTypeInfo, 
                getBooleanProperty("rendered", attributes), //$NON-NLS-1$
                getDataModelInfo("$dataModel", attributes),  //$NON-NLS-1$
                getIntegerProperty("first", attributes),  //$NON-NLS-1$
                getComponentProperty("footer", attributes), //$NON-NLS-1$
                getComponentProperty("header", attributes),  //$NON-NLS-1$
                getIntegerProperty("rowCount", attributes),  //$NON-NLS-1$
                getBooleanProperty("rowAvailable", attributes),  //$NON-NLS-1$
                attributes.get("rowData"), //$NON-NLS-1$
                getIntegerProperty("rowIndex", attributes),  //$NON-NLS-1$
                getIntegerProperty("rows", attributes),  //$NON-NLS-1$
                attributes.get("value"), //$NON-NLS-1$
                getStringProperty("var", attributes, true)); //$NON-NLS-1$
    }

    private static DataModelInfo getDataModelInfo(String key, Map attributes)


    protected String getMostSpecificComponentName()
    {
        return "UIData"; //$NON-NLS-1$
    }
}

Lines 90-96 Link Here

(-)src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentTypeInfo.java (-2 / +2 lines)
90		90
91	public String toString()	91	public String toString()
92	{	92	{
93	return "Component Type Info: type = " + _componentType + " family=" + _componentFamily	93	return "Component Type Info: type = " + _componentType + " family=" + _componentFamily //$NON-NLS-1$ //$NON-NLS-2$
94	+ " renderer=" + _renderFamily + ", "+super.toString();	94	+ " renderer=" + _renderFamily + ", "+super.toString(); //$NON-NLS-1$ //$NON-NLS-2$
95	}	95	}
96	}	96	}




    protected UICommandInfo(final ComponentInfo parent, final ComponentTypeInfo componentTypeInfo,
            Map attributes)
    {
        this(getStringProperty("id", attributes, true), //$NON-NLS-1$
                parent, componentTypeInfo,
                getBooleanProperty("rendered", attributes), //$NON-NLS-1$
                getActionSourceInfo("$actionSourceInfo", attributes) //$NON-NLS-1$
                );
    }
    


    protected String getMostSpecificComponentName()
    {
        return "UICommand"; //$NON-NLS-1$
    }
}




    protected ComponentInfo(final ComponentInfo parent,
            final ComponentTypeInfo componentTypeInfo, final Map attributes)
    {
        this(getStringProperty("id", attributes, false), parent, //$NON-NLS-1$
                componentTypeInfo, getBooleanProperty("rendered", attributes)); //$NON-NLS-1$
    }

    /**

        if (mandatory && value == null)
        {
            throw new IllegalArgumentException(key
                    + " is a mandatory attribute"); //$NON-NLS-1$
        }
        return (String) value;
    }


        if (value == null)
        {
            throw new IllegalArgumentException(key + "is mandatory"); //$NON-NLS-1$
        }

        return value.booleanValue();


        if (value == null)
        {
            throw new IllegalArgumentException(key + " is mandatory"); //$NON-NLS-1$
        }

        return value.intValue();

        if (childComponent == this)
        {
            throw new IllegalArgumentException(
                    "A component cannot be its own child"); //$NON-NLS-1$
        }
        _data.addChild(childComponent);
        // we need to reset the child's parent to me

    public String toString()
    {
        final String parentId = getParent() != null ? getParent().getId()
                : "null"; //$NON-NLS-1$
        String toString = getMostSpecificComponentName() + ": id=" //$NON-NLS-1$
                + _data.getId() + ", parentId: " + parentId + ", family=" //$NON-NLS-1$ //$NON-NLS-2$
                + getComponentTypeInfo().getComponentFamily() + ", render=" //$NON-NLS-1$
                + getComponentTypeInfo().getRenderFamily() + ", rendered=" //$NON-NLS-1$
                + isRendered();

        // use bean introspection to dump child properties


    private String dumpProperties()
    {
        String properties = ""; //$NON-NLS-1$
        try
        {
            final BeanInfo beanInfo = Introspector.getBeanInfo(this.getClass(),

                final String name = desc.getName();
                final Object valueObj = desc.getValue(name);
                final String value = valueObj != null ? valueObj.toString()
                        : "null"; //$NON-NLS-1$
                properties += ", " + name + "=" + value; //$NON-NLS-1$ //$NON-NLS-2$
            }
        }
        catch (final IntrospectionException e)
        {
            return "Error introspecting bean: " + e.getLocalizedMessage(); //$NON-NLS-1$
        }

        return properties;

     */
    protected String getMostSpecificComponentName()
    {
        return "UIComponent"; //$NON-NLS-1$
    }

    /**

            if (Thread.holdsLock(this))
            {
                throw new IllegalStateException(
                        "Must not already own this lock"); //$NON-NLS-1$
            }

            // must always acquire component lock first to prevent deadlock

            if (Thread.holdsLock(this))
            {
                throw new IllegalStateException(
                        "Must not already own this lock"); //$NON-NLS-1$
            }

            // must always acquire component lock first to prevent deadlock

                {
                    // TODO: need logging
                    System.err
                            .println("Name collision in properties.  Trying to add [" //$NON-NLS-1$
                                    + desc.toString()
                                    + " when already have " //$NON-NLS-1$
                                    + toMe.get(desc.getName()));
                }
            }




    protected UIOutputInfo(final ComponentInfo parent, final ComponentTypeInfo typeInfo,
            final Map attributes)
    {
        this(getStringProperty("id", attributes, true), //$NON-NLS-1$
                parent,
                typeInfo,
                getValueHolderInfo("$valueHolderInfo", attributes), //$NON-NLS-1$
                getBooleanProperty("rendered", attributes)); //$NON-NLS-1$
    }
    
    /**

    
    // @Override
    protected String getMostSpecificComponentName() {
        return "UIOutput"; //$NON-NLS-1$
    }

    public final ConverterDecorator getConverter() {




        if (className == null && converterId == null)
        {
            throw new IllegalArgumentException(
                    "converterClass and converterId must not both be null.  For unknown validator use the UNKNOWN constant"); //$NON-NLS-1$
        }

        _converterId = converterId;

        if (className == null && converterId == null)
        {
            throw new IllegalArgumentException(
                    "converterClass and converterId must not both be null.  For unknown validator use the UNKNOWN constant"); //$NON-NLS-1$
        }

        _converterId = converterId;


    public String toString()
    {
        return "Converter Type Info: type = " + _converterId + ", "+super.toString(); //$NON-NLS-1$ //$NON-NLS-2$
    }
}




        
        if (validatorClass == null && validatorId == null)
        {
            throw new IllegalArgumentException("validatorClass and validatorId must not both be null.  For unknown validator use the UNKNOWN constant"); //$NON-NLS-1$
        }
        _validatorId = validatorId;
    }

        
        if (validatorClass == null && validatorId == null)
        {
            throw new IllegalArgumentException("validatorClass and validatorId must not both be null.  For unknown validator use the UNKNOWN constant"); //$NON-NLS-1$
        }
        _validatorId = validatorId;
    }

    
    public String toString()
    {
        return "Validator Type Info: type = " + _validatorId + ", "+super.toString(); //$NON-NLS-1$ //$NON-NLS-2$
    }

}

Lines 31-37 Link Here

(-)src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IHandlerTagElement.java (-1 / +1 lines)
31	private final static int HANDLER_TYPE_ATTRIBUTE = 3;	31	private final static int HANDLER_TYPE_ATTRIBUTE = 3;
32		32
33	private final static String[] strValues =	33	private final static String[] strValues =
34	{"facet", "actionLister", "valueChangeListener"};	34	{"facet", "actionListener", "valueChangeListener"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
35		35
36	private final int _intValue;	36	private final int _intValue;
37		37

Lines 29-35 Link Here

(-)src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IJSFTagElement.java (-1 / +1 lines)
29	//private final static int TYPE_UNKNOWN = 4;	29	//private final static int TYPE_UNKNOWN = 4;
30		30
31	private final static String[] strValues =	31	private final static String[] strValues =
32	{"component", "converter", "validator", "handler"};	32	{"component", "converter", "validator", "handler"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
33		33
34	private final int _intValue;	34	private final int _intValue;
35		35





            if (decorator == null || associatedType == null)
            {
                throw new IllegalArgumentException("Arguments must not be null"); //$NON-NLS-1$
            }

            final List decoratorsByType = (List) getDecoratorMap().get(


            if (adapterType == null || adapter == null)
            {
                throw new IllegalArgumentException("Arguments must not be null"); //$NON-NLS-1$
            }

            if (!adapterType.isInstance(adapter))
            {
                throw new IllegalArgumentException("adapter: " + adapter //$NON-NLS-1$
                        + " must be cast compatible to class: " + adapterType); //$NON-NLS-1$
            }
            else if (adapterType.isInstance(_owner))
            {
                throw new IllegalArgumentException("this: " + _owner //$NON-NLS-1$
                        + " must not already be an instance of class: " //$NON-NLS-1$
                        + adapterType);
            }
            getAdapterMap().put(adapterType, adapter);


            if (decorator == null)
            {
                throw new IllegalArgumentException("Arguments must not be null"); //$NON-NLS-1$
            }
            final Class associationType = decorator.getClass();
            addDecorator(decorator, associationType);


            if (decorator == null || associatedType == null)
            {
                throw new IllegalArgumentException("Arguments must not be null"); //$NON-NLS-1$
            }

            List decoratorsByType = (List) getDecoratorMap().get(associatedType);

        {
            if (isProtected())
            {
                throw new UnsupportedOperationException("Object "+this.toString()+ " is locked for modification"); //$NON-NLS-1$ //$NON-NLS-2$
            }
        }





#Tue Apr 22 16:19:01 PDT 2008
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2

org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
org.eclipse.jdt.core.compiler.problem.nullReference=ignore
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore

org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled

org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
org.eclipse.jdt.core.compiler.problem.unusedImport=error

org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.3

Lines 14-20 Link Here

(-)src/org/eclipse/jst/jsf/common/runtime/internal/JSFCommonRuntimePlugin.java (-1 / +1 lines)
14	/**	14	/**
15	* The plug-in ID	15	* The plug-in ID
16	*/	16	*/
17	public static final String PLUGIN_ID = "CommonComponentPlugin";	17	public static final String PLUGIN_ID = "CommonComponentPlugin"; //$NON-NLS-1$
18		18
19	// The shared instance	19	// The shared instance
20	private static JSFCommonRuntimePlugin plugin;	20	private static JSFCommonRuntimePlugin plugin;




    }
    public String toString()
    {
        String toString = "Root node: "+_renderedNodeName+", attributes: ["; //$NON-NLS-1$ //$NON-NLS-2$
        
        for (Iterator it = _renderedAttributes.iterator(); it.hasNext();)
        {
            final RenderAttribute attribute = (RenderAttribute) it.next();
            toString+=attribute.getName() + "=" + attribute.getValue(); //$NON-NLS-1$
            
            toString+=it.hasNext() ? ", " : "]"; //$NON-NLS-1$ //$NON-NLS-2$
        }
        
        return toString;





    public String toString()
    {
        String supers = "["; //$NON-NLS-1$
        
        for (int i = 0; i < _superClasses.length; i++)
        {

            
            if (i < _superClasses.length-1)
            {
                supers += ","; //$NON-NLS-1$
            }
        }
        

            
            if (i < _interfaces.length-1)
            {
                supers += ","; //$NON-NLS-1$
            }
        }
        supers +="]"; //$NON-NLS-1$
        
        return "class= "+getClassName()+ ", supers="+ supers; //$NON-NLS-1$ //$NON-NLS-2$
    }
}




 */
public class SelectShuttleOperation extends AbstractTrinidadTransformOperation {

	private static final String STYLE_HEADER = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:9pt;color:#669966;font-weight:bold;padding:0px 0px 0px 18px;"; //$NON-NLS-1$
	private static final String STYLE_REQUIRED = "color:#669966;font-family:Courier,sans-serif;"; //$NON-NLS-1$
	private static final String STYLE_LISTCOLUMN = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:normal;"; //$NON-NLS-1$
	private static final String STYLE_SELECT = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:normal;color:#000000;"; //$NON-NLS-1$
	private static final String STYLE_DESCRIPTION = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:normal;color:#000000;"; //$NON-NLS-1$
	private static final String STYLE_LINK = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:normal;color:#003333;"; //$NON-NLS-1$
	private static final String DEFAULT_SIZE = "10"; //$NON-NLS-1$

	private static final String[] LINKS_MOVE = new String[]{
		Messages.SelectShuttleOperation_LinkMove,

		//build footer structure
		String footerFacetName;
		if (isLeadingColumn) {
			footerFacetName = "leadingFooter"; //$NON-NLS-1$
		} else {
			footerFacetName = "trailingFooter"; //$NON-NLS-1$
		}
		Element footerFacet = getChildFacetByName(srcElement, footerFacetName); //$NON-NLS-1$
		if (footerFacet != null) {

	}

	private String getSizeString(Element srcElement) {
		String size = DEFAULT_SIZE;
		String sizeAttr = srcElement.getAttribute("size"); //$NON-NLS-1$
		if (sizeAttr != null && sizeAttr.length() > 0) {
			try {
				int iSize = Integer.parseInt(sizeAttr);

Lines 133-139 Link Here

(-)src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/converter/operations/PanelTabbedOperation.java (-1 / +1 lines)
133	appendAttribute(tableElement, "border", "0"); //$NON-NLS-1$ //$NON-NLS-2$	133	appendAttribute(tableElement, "border", "0"); //$NON-NLS-1$ //$NON-NLS-2$
134	appendAttribute(tableElement, "width", "100%"); //$NON-NLS-1$ //$NON-NLS-2$	134	appendAttribute(tableElement, "width", "100%"); //$NON-NLS-1$ //$NON-NLS-2$
135	appendAttribute(tableElement, "summary", ""); //$NON-NLS-1$ //$NON-NLS-2$	135	appendAttribute(tableElement, "summary", ""); //$NON-NLS-1$ //$NON-NLS-2$
136	Element trElement = appendChildElement("tr", tableElement);	136	Element trElement = appendChildElement("tr", tableElement); //$NON-NLS-1$
137		137
138	//append first separator	138	//append first separator
139	appendSeparatorTD(trElement, SEP_POS_START);	139	appendSeparatorTD(trElement, SEP_POS_START);

Lines 66-74 Link Here

(-)src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/converter/operations/AbstractLabelAndHelpOperation.java (-3 / +3 lines)
66	} else {	66	} else {
67	outerElement = createElement("table"); //$NON-NLS-1$	67	outerElement = createElement("table"); //$NON-NLS-1$
68	//append table-specific attributes	68	//append table-specific attributes
69	appendAttribute(outerElement, "cellpadding", "0"); //$NON-NLS-1$	69	appendAttribute(outerElement, "cellpadding", "0"); //$NON-NLS-1$ //$NON-NLS-2$
70	appendAttribute(outerElement, "cellspacing", "0"); //$NON-NLS-1$	70	appendAttribute(outerElement, "cellspacing", "0"); //$NON-NLS-1$ //$NON-NLS-2$
71	appendAttribute(outerElement, "border", "0"); //$NON-NLS-1$	71	appendAttribute(outerElement, "border", "0"); //$NON-NLS-1$ //$NON-NLS-2$
72	}	72	}
73		73
74	//append common attributes	74	//append common attributes

Lines 90-98 Link Here

(-)src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/converter/operations/OutputFormattedOperation.java (-2 / +2 lines)
90	String value = srcElement.getAttribute("value"); //$NON-NLS-1$	90	String value = srcElement.getAttribute("value"); //$NON-NLS-1$
91	if (value != null && value.length() > 0) {	91	if (value != null && value.length() > 0) {
92	StringBuffer wrappedValue = new StringBuffer();	92	StringBuffer wrappedValue = new StringBuffer();
93	wrappedValue.append("<?xml version=\"1.0\"?><value>");	93	wrappedValue.append("<?xml version=\"1.0\"?><value>"); //$NON-NLS-1$
94	wrappedValue.append(value);	94	wrappedValue.append(value);
95	wrappedValue.append("</value>");	95	wrappedValue.append("</value>"); //$NON-NLS-1$
96	InputStream inputStream = new ByteArrayInputStream(wrappedValue.toString().getBytes());	96	InputStream inputStream = new ByteArrayInputStream(wrappedValue.toString().getBytes());
97	Element valueElement = getValueDocumentElement(inputStream);	97	Element valueElement = getValueDocumentElement(inputStream);
98	if (valueElement != null) {	98	if (valueElement != null) {

Lines 25-35 Link Here

(-)src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/el/TrinidadDecorativeVariableResolver.java (-4 / +4 lines)
25	{	25	{
26	private final static JSFSymbolFactory _symbolFactory = new JSFSymbolFactory();	26	private final static JSFSymbolFactory _symbolFactory = new JSFSymbolFactory();
27		27
28	public final static String PAGE_FLOW_SCOPE_VARIABLE_NAME = "pageFlowScope";	28	public final static String PAGE_FLOW_SCOPE_VARIABLE_NAME = "pageFlowScope"; //$NON-NLS-1$
29	public final static String PROCESS_SCOPE_VARIABLE_NAME = "processScope";	29	public final static String PROCESS_SCOPE_VARIABLE_NAME = "processScope"; //$NON-NLS-1$
30		30
31	public final static String REQUEST_CONTEXT_VARIABLE_NAME = "requestContext";	31	public final static String REQUEST_CONTEXT_VARIABLE_NAME = "requestContext"; //$NON-NLS-1$
32	public final static String REQUEST_CONTEXT_CLASS_NAME = "org.apache.myfaces.trinidad.context.RequestContext";	32	public final static String REQUEST_CONTEXT_CLASS_NAME = "org.apache.myfaces.trinidad.context.RequestContext"; //$NON-NLS-1$
33		33
34	@Override	34	@Override
35	public ISymbol[] getAllVariables(final DTFacesContext facesContext,	35	public ISymbol[] getAllVariables(final DTFacesContext facesContext,

Lines 24-30 Link Here

(-)src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/TrinidadTagSupportActivator.java (-1 / +1 lines)
24	/**	24	/**
25	* the plugin id	25	* the plugin id
26	*/	26	*/
27	public static final String PLUGIN_ID = "org.eclipse.jst.jsf.apache.trinidad.tagsupport";	27	public static final String PLUGIN_ID = "org.eclipse.jst.jsf.apache.trinidad.tagsupport"; //$NON-NLS-1$
28		28
29	// The shared instance	29	// The shared instance
30	private static TrinidadTagSupportActivator plugin;	30	private static TrinidadTagSupportActivator plugin;




     * <!-- end-user-doc -->
     * @generated
     */
    public static final String copyright = "Copyright (c) 2005, 2006 IBM Corporation and others"; //$NON-NLS-1$

	/**
	 * Editor id string.  TODO: broken?
	 */
	public static final String FACES_CONFIG_EDITOR_ID = "org.eclipse.jst.jsf.facesconfig.internal.presentation.FacesConfigEditor"; //$NON-NLS-1$

	/**
	 * The plugin instance




     * @generated
     */
	@SuppressWarnings("hiding")
	public static final String copyright = "Copyright (c) 2005, 2006 IBM Corporation and others"; //$NON-NLS-1$

    /**
     * This constructs an instance from a factory and a notifier.

     * @generated
     */
	public Object getImage(Object object) {
        return overlayImage(object, getResourceLocator().getImage("full/obj16/FacetExtensionType")); //$NON-NLS-1$
    }

    /**

	public String getText(Object object) {
        String label = ((FacetExtensionType)object).getId();
        return label == null || label.length() == 0 ?
            getString("_UI_FacetExtensionType_type") : //$NON-NLS-1$
            getString("_UI_FacetExtensionType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
    }

    /**

Return to bug 186459

Lines 159-167 Link Here

(-)src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringDialogField.java (-3 / +3 lines)
159		159
160	if (toolkit != null) {	160	if (toolkit != null) {
161	if (_numRows <= 1) {	161	if (_numRows <= 1) {
162	_textControl = toolkit.createText(parent, "");	162	_textControl = toolkit.createText(parent, ""); //$NON-NLS-1$
163	} else {	163	} else {
164	_textControl = toolkit.createText(parent, "", SWT.V_SCROLL);	164	_textControl = toolkit.createText(parent, "", SWT.V_SCROLL); //$NON-NLS-1$
165	}	165	}
166	} else {	166	} else {
167	if (_numRows <= 1) {	167	if (_numRows <= 1) {
Lines 271-277 Link Here
271	_pending = false;	271	_pending = false;
272		272
273	if (text == null)	273	if (text == null)
274	text = "";	274	text = ""; //$NON-NLS-1$
275	_text = text;	275	_text = text;
276	if (isOkToUse(_textControl)) {	276	if (isOkToUse(_textControl)) {
277	_textControl.removeModifyListener(_modifyListener);	277	_textControl.removeModifyListener(_modifyListener);

Lines 94-101 Link Here

(-)src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentInfo.java (-20 / +20 lines)
94	protected ComponentInfo(final ComponentInfo parent,	94	protected ComponentInfo(final ComponentInfo parent,
95	final ComponentTypeInfo componentTypeInfo, final Map attributes)	95	final ComponentTypeInfo componentTypeInfo, final Map attributes)
96	{	96	{
97	this(getStringProperty("id", attributes, false), parent,	97	this(getStringProperty("id", attributes, false), parent, //$NON-NLS-1$
98	componentTypeInfo, getBooleanProperty("rendered", attributes));	98	componentTypeInfo, getBooleanProperty("rendered", attributes)); //$NON-NLS-1$
99	}	99	}
100		100
101	/**	101	/**
Lines 117-123 Link Here
117	if (mandatory && value == null)	117	if (mandatory && value == null)
118	{	118	{
119	throw new IllegalArgumentException(key	119	throw new IllegalArgumentException(key
120	+ " is a mandatory attribute");	120	+ " is a mandatory attribute"); //$NON-NLS-1$
121	}	121	}
122	return (String) value;	122	return (String) value;
123	}	123	}
Lines 139-145 Link Here
139		139
140	if (value == null)	140	if (value == null)
141	{	141	{
142	throw new IllegalArgumentException(key + "is mandatory");	142	throw new IllegalArgumentException(key + "is mandatory"); //$NON-NLS-1$
143	}	143	}
144		144
145	return value.booleanValue();	145	return value.booleanValue();
Lines 158-164 Link Here
158		158
159	if (value == null)	159	if (value == null)
160	{	160	{
161	throw new IllegalArgumentException(key + " is mandatory");	161	throw new IllegalArgumentException(key + " is mandatory"); //$NON-NLS-1$
162	}	162	}
163		163
164	return value.intValue();	164	return value.intValue();
Lines 232-238 Link Here
232	if (childComponent == this)	232	if (childComponent == this)
233	{	233	{
234	throw new IllegalArgumentException(	234	throw new IllegalArgumentException(
235	"A component cannot be its own child");	235	"A component cannot be its own child"); //$NON-NLS-1$
236	}	236	}
237	_data.addChild(childComponent);	237	_data.addChild(childComponent);
238	// we need to reset the child's parent to me	238	// we need to reset the child's parent to me
Lines 315-325 Link Here
315	public String toString()	315	public String toString()
316	{	316	{
317	final String parentId = getParent() != null ? getParent().getId()	317	final String parentId = getParent() != null ? getParent().getId()
318	: "null";	318	: "null"; //$NON-NLS-1$
319	String toString = getMostSpecificComponentName() + ": id="	319	String toString = getMostSpecificComponentName() + ": id=" //$NON-NLS-1$
320	+ _data.getId() + ", parentId: " + parentId + ", family="	320	+ _data.getId() + ", parentId: " + parentId + ", family=" //$NON-NLS-1$ //$NON-NLS-2$
321	+ getComponentTypeInfo().getComponentFamily() + ", render="	321	+ getComponentTypeInfo().getComponentFamily() + ", render=" //$NON-NLS-1$
322	+ getComponentTypeInfo().getRenderFamily() + ", rendered="	322	+ getComponentTypeInfo().getRenderFamily() + ", rendered=" //$NON-NLS-1$
323	+ isRendered();	323	+ isRendered();
324		324
325	// use bean introspection to dump child properties	325	// use bean introspection to dump child properties
Lines 333-339 Link Here
333		333
334	private String dumpProperties()	334	private String dumpProperties()
335	{	335	{
336	String properties = "";	336	String properties = ""; //$NON-NLS-1$
337	try	337	try
338	{	338	{
339	final BeanInfo beanInfo = Introspector.getBeanInfo(this.getClass(),	339	final BeanInfo beanInfo = Introspector.getBeanInfo(this.getClass(),
Lines 347-359 Link Here
347	final String name = desc.getName();	347	final String name = desc.getName();
348	final Object valueObj = desc.getValue(name);	348	final Object valueObj = desc.getValue(name);
349	final String value = valueObj != null ? valueObj.toString()	349	final String value = valueObj != null ? valueObj.toString()
350	: "null";	350	: "null"; //$NON-NLS-1$
351	properties += ", " + name + "=" + value;	351	properties += ", " + name + "=" + value; //$NON-NLS-1$ //$NON-NLS-2$
352	}	352	}
353	}	353	}
354	catch (final IntrospectionException e)	354	catch (final IntrospectionException e)
355	{	355	{
356	return "Error introspecting bean: " + e.getLocalizedMessage();	356	return "Error introspecting bean: " + e.getLocalizedMessage(); //$NON-NLS-1$
357	}	357	}
358		358
359	return properties;	359	return properties;
Lines 364-370 Link Here
364	*/	364	*/
365	protected String getMostSpecificComponentName()	365	protected String getMostSpecificComponentName()
366	{	366	{
367	return "UIComponent";	367	return "UIComponent"; //$NON-NLS-1$
368	}	368	}
369		369
370	/**	370	/**
Lines 682-688 Link Here
682	if (Thread.holdsLock(this))	682	if (Thread.holdsLock(this))
683	{	683	{
684	throw new IllegalStateException(	684	throw new IllegalStateException(
685	"Must not already own this lock");	685	"Must not already own this lock"); //$NON-NLS-1$
686	}	686	}
687		687
688	// must always acquire component lock first to prevent deadlock	688	// must always acquire component lock first to prevent deadlock
Lines 713-719 Link Here
713	if (Thread.holdsLock(this))	713	if (Thread.holdsLock(this))
714	{	714	{
715	throw new IllegalStateException(	715	throw new IllegalStateException(
716	"Must not already own this lock");	716	"Must not already own this lock"); //$NON-NLS-1$
717	}	717	}
718		718
719	// must always acquire component lock first to prevent deadlock	719	// must always acquire component lock first to prevent deadlock
Lines 785-793 Link Here
785	{	785	{
786	// TODO: need logging	786	// TODO: need logging
787	System.err	787	System.err
788	.println("Name collision in properties. Trying to add ["	788	.println("Name collision in properties. Trying to add [" //$NON-NLS-1$
789	+ desc.toString()	789	+ desc.toString()
790	+ " when already have "	790	+ " when already have " //$NON-NLS-1$
791	+ toMe.get(desc.getName()));	791	+ toMe.get(desc.getName()));
792	}	792	}
793	}	793	}

Lines 99-105 Link Here

(-)src/org/eclipse/jst/jsf/common/runtime/internal/model/types/ClassTypeInfo.java (-5 / +5 lines)
99		99
100	public String toString()	100	public String toString()
101	{	101	{
102	String supers = "[";	102	String supers = "["; //$NON-NLS-1$
103		103
104	for (int i = 0; i < _superClasses.length; i++)	104	for (int i = 0; i < _superClasses.length; i++)
105	{	105	{
Lines 107-113 Link Here
107		107
108	if (i < _superClasses.length-1)	108	if (i < _superClasses.length-1)
109	{	109	{
110	supers += ",";	110	supers += ","; //$NON-NLS-1$
111	}	111	}
112	}	112	}
113		113
Lines 117-127 Link Here
117		117
118	if (i < _interfaces.length-1)	118	if (i < _interfaces.length-1)
119	{	119	{
120	supers += ",";	120	supers += ","; //$NON-NLS-1$
121	}	121	}
122	}	122	}
123	supers +="]";	123	supers +="]"; //$NON-NLS-1$
124		124
125	return "class= "+getClassName()+ ", supers="+ supers;	125	return "class= "+getClassName()+ ", supers="+ supers; //$NON-NLS-1$ //$NON-NLS-2$
126	}	126	}
127	}	127	}

Lines 36-41 Link Here

(-)src/org/eclipse/jst/jsf/common/ui/internal/utils/PropertyUtils.java (-7 / +17 lines)
36	* @author mengbo	36	* @author mengbo
37	*/	37	*/
38	public final class PropertyUtils {	38	public final class PropertyUtils {
		39
		40	private static final String ENCODED_CHAR_PERCENT = "%25"; //$NON-NLS-1$
		41	private static final String ENCODED_CHAR_CARRIAGE_RETURN = "%0d"; //$NON-NLS-1$
		42	private static final String ENCODED_CHAR_TAB = "%09"; //$NON-NLS-1$
		43	private static final String ENCODED_CHAR_NEWLINE = "%0a"; //$NON-NLS-1$
		44	private static final String ENCODED_CHAR_SPACE = "%20"; //$NON-NLS-1$
		45	private static final String ENCODED_CHAR_COLON = "%3a"; //$NON-NLS-1$
		46	private static final String ENCODED_CHAR_EQUALS = "%3d"; //$NON-NLS-1$
		47
		48
39	// WARNING: There can be NO static logging line here since the logger uses	49	// WARNING: There can be NO static logging line here since the logger uses
40	// this class to figure out the preferences	50	// this class to figure out the preferences
41	// for the logging system. "Logging" an error here would be useless since	51	// for the logging system. "Logging" an error here would be useless since
Lines 340-365 Link Here
340	switch (ch) {	350	switch (ch) {
341	// these are the set of illegal characters in a Property name	351	// these are the set of illegal characters in a Property name
342	case '=': // %3d	352	case '=': // %3d
343	encoded.append("%3d");	353	encoded.append(ENCODED_CHAR_EQUALS);
344	break;	354	break;
345	case ':': // %3a	355	case ':': // %3a
346	encoded.append("%3a");	356	encoded.append(ENCODED_CHAR_COLON);
347	break;	357	break;
348	case ' ': // %20	358	case ' ': // %20
349	encoded.append("%20");	359	encoded.append(ENCODED_CHAR_SPACE);
350	break;	360	break;
351	case '\n': // %0a	361	case '\n': // %0a
352	encoded.append("%0a");	362	encoded.append(ENCODED_CHAR_NEWLINE);
353	break;	363	break;
354	case '\t': // %09	364	case '\t': // %09
355	encoded.append("%09");	365	encoded.append(ENCODED_CHAR_TAB);
356	break;	366	break;
357	case '\r': // %0d	367	case '\r': // %0d
358	encoded.append("%0d");	368	encoded.append(ENCODED_CHAR_CARRIAGE_RETURN);
359	break;	369	break;
360	case '%': // %25	370	case '%': // %25
361	// added because its our encoding flag	371	// added because its our encoding flag
362	encoded.append("%25");	372	encoded.append(ENCODED_CHAR_PERCENT);
363	break;	373	break;
364	default:	374	default:
365	encoded.append(ch);	375	encoded.append(ch);

Lines 40-56 Link Here

(-)src/org/eclipse/jst/jsf/common/ui/internal/utils/FavoriteConfigurations.java (-8 / +8 lines)
40	private static Logger _log = JSFUICommonPlugin	40	private static Logger _log = JSFUICommonPlugin
41	.getLogger(FavoriteConfigurations.class);	41	.getLogger(FavoriteConfigurations.class);
42		42
43	private final static String FAV_EXTENSIONS = ".xml";	43	private final static String FAV_EXTENSIONS = ".xml"; //$NON-NLS-1$
44		44
45	private final static String ELEMENT_ROOT = "favorite";	45	private final static String ELEMENT_ROOT = "favorite"; //$NON-NLS-1$
46		46
47	private final static String ELEMENT_CONFIG = "config";	47	private final static String ELEMENT_CONFIG = "config"; //$NON-NLS-1$
48		48
49	private final static String ELEMENT_NAME = "name";	49	private final static String ELEMENT_NAME = "name"; //$NON-NLS-1$
50		50
51	private final static String ELEMENT_PROPERTY = "property";	51	private final static String ELEMENT_PROPERTY = "property"; //$NON-NLS-1$
52		52
53	private final static String ELEMENT_VALUE = "value";	53	private final static String ELEMENT_VALUE = "value"; //$NON-NLS-1$
54		54
55	private Map _favorites;	55	private Map _favorites;
56		56
Lines 111-117 Link Here
111	} catch (Exception ee) {	111	} catch (Exception ee) {
112	// log.FavoriteConfigurations.save.error=Failed to save {0}	112	// log.FavoriteConfigurations.save.error=Failed to save {0}
113	// favorites. File={1}	113	// favorites. File={1}
114	_log.info("log.FavoriteConfigurations.save.error", _favoriteName,	114	_log.info("log.FavoriteConfigurations.save.error", _favoriteName, //$NON-NLS-1$
115	_favoriteFile.toOSString(), ee);	115	_favoriteFile.toOSString(), ee);
116	} finally {	116	} finally {
117	if (fw != null) {	117	if (fw != null) {
Lines 180-186 Link Here
180	} catch (Exception ee) {	180	} catch (Exception ee) {
181	// log.FavoriteConfigurations.read.error=Failed to save {0}	181	// log.FavoriteConfigurations.read.error=Failed to save {0}
182	// favorites. File={1}	182	// favorites. File={1}
183	_log.error("log.FavoriteConfigurations.read.error", _favoriteName,	183	_log.error("log.FavoriteConfigurations.read.error", _favoriteName, //$NON-NLS-1$
184	_favoriteFile.toOSString(), ee);	184	_favoriteFile.toOSString(), ee);
185	} finally {	185	} finally {
186	if (fr != null) {	186	if (fr != null) {

Lines 39-66 Link Here

(-)src/org/eclipse/jst/jsf/common/ui/JSFUICommonPlugin.java (-29 / +29 lines)
39	*/	39	*/
40	public class JSFUICommonPlugin extends AbstractUIPlugin {	40	public class JSFUICommonPlugin extends AbstractUIPlugin {
41	// Properties contains general properties and defaults to preferences.	41	// Properties contains general properties and defaults to preferences.
42	private static final String PROPERTIES = "default.properties";	42	private static final String PROPERTIES = "default.properties"; //$NON-NLS-1$
43	// preferences will	43	// preferences will
44	// contain this string	44	// contain this string
45	// in the key.	45	// in the key.
46		46
47	private static final String P_CONSOLE_LOGGING = "console.logging.on";	47	private static final String P_CONSOLE_LOGGING = "console.logging.on"; //$NON-NLS-1$
48		48
49	private static final String P_CONSOLE_LOG_LEVEL = "console.logging.max.level";	49	private static final String P_CONSOLE_LOG_LEVEL = "console.logging.max.level"; //$NON-NLS-1$
50		50
51	private static final String P_ECLIPSE_LOGGING = "eclipse.logging.on";	51	private static final String P_ECLIPSE_LOGGING = "eclipse.logging.on"; //$NON-NLS-1$
52		52
53	private static final String P_ECLIPSE_LOG_LEVEL = "eclipse.logging.max.level";	53	private static final String P_ECLIPSE_LOG_LEVEL = "eclipse.logging.max.level"; //$NON-NLS-1$
54		54
55	private static final String P_FILE_LOGGING = "file.logging.on";	55	private static final String P_FILE_LOGGING = "file.logging.on"; //$NON-NLS-1$
56		56
57	private static final String P_FILE_LOG_LEVEL = "file.logging.max.level";	57	private static final String P_FILE_LOG_LEVEL = "file.logging.max.level"; //$NON-NLS-1$
58		58
59	private static final String P_FILE_PATH = "file.logging.path";	59	private static final String P_FILE_PATH = "file.logging.path"; //$NON-NLS-1$
60		60
61	private static final String P_FILE_CLEAR = "file.logging.startup.clear";	61	private static final String P_FILE_CLEAR = "file.logging.startup.clear"; //$NON-NLS-1$
62		62
63	private static final String P_FILE_ROLLOVER_FREQUENCY = "file.logging.rollover.frequency";	63	private static final String P_FILE_ROLLOVER_FREQUENCY = "file.logging.rollover.frequency"; //$NON-NLS-1$
64		64
65	private static final int DEBUG_LEVEL = 0;	65	private static final int DEBUG_LEVEL = 0;
66		66
Lines 122-140 Link Here
122	if (isThreeDot() == false) {	122	if (isThreeDot() == false) {
123	throw new CoreException(new Status(IStatus.ERROR, getBundle()	123	throw new CoreException(new Status(IStatus.ERROR, getBundle()
124	.getSymbolicName(), IStatus.OK,	124	.getSymbolicName(), IStatus.OK,
125	"Requires eclipse version 3.x", null));	125	"Requires eclipse version 3.x", null)); //$NON-NLS-1$
126	}	126	}
127		127
128	try {	128	try {
129	// get resource bundle.	129	// get resource bundle.
130	_resourceBundle = ResourceBundle	130	_resourceBundle = ResourceBundle
131	.getBundle("org.eclipse.jst.jsf.common.ui.CommonResources");	131	.getBundle("org.eclipse.jst.jsf.common.ui.CommonResources"); //$NON-NLS-1$
132	_alerts = new Alerts(this, _resourceBundle);	132	_alerts = new Alerts(this, _resourceBundle);
133		133
134	// get properties.	134	// get properties.
135	_properties = new Properties();	135	_properties = new Properties();
136	InputStream input = null;	136	InputStream input = null;
137	_pluginBase = getBundle().getEntry("/");	137	_pluginBase = getBundle().getEntry("/"); //$NON-NLS-1$
138	try {	138	try {
139	input = (new URL(_pluginBase, PROPERTIES)).openStream();	139	input = (new URL(_pluginBase, PROPERTIES)).openStream();
140	_properties.load(input);	140	_properties.load(input);
Lines 162-169 Link Here
162	if (_log != null) {	162	if (_log != null) {
163	_log	163	_log
164	.error(	164	.error(
165	"log.msg",	165	"log.msg", //$NON-NLS-1$
166	"Problems starting plug-in Web Application Development Common.",	166	"Problems starting plug-in Web Application Development Common.", //$NON-NLS-1$
167	ee);	167	ee);
168	}	168	}
169		169
Lines 172-178 Link Here
172	IStatus.ERROR,	172	IStatus.ERROR,
173	getBundle().getSymbolicName(),	173	getBundle().getSymbolicName(),
174	IStatus.OK,	174	IStatus.OK,
175	"Problems starting plug-in Web Application Development Common",	175	"Problems starting plug-in Web Application Development Common", //$NON-NLS-1$
176	ee));	176	ee));
177	}	177	}
178	}	178	}
Lines 284-296 Link Here
284	if (image == null) {	284	if (image == null) {
285	try {	285	try {
286	ImageDescriptor id = ImageDescriptor.createFromURL(new URL(	286	ImageDescriptor id = ImageDescriptor.createFromURL(new URL(
287	_pluginBase, "icons/" + name));	287	_pluginBase, "icons/" + name)); //$NON-NLS-1$
288	images.put(name, id);	288	images.put(name, id);
289		289
290	image = images.get(name);	290	image = images.get(name);
291	} catch (MalformedURLException ee) {	291	} catch (MalformedURLException ee) {
292	// log.CommonPlugin.image.error=Image {0} not found.	292	// log.CommonPlugin.image.error=Image {0} not found.
293	_log.error("log.msg", "log.CommonPlugin.image.error", name, ee);	293	_log.error("log.msg", "log.CommonPlugin.image.error", name, ee); //$NON-NLS-1$ //$NON-NLS-2$
294	}	294	}
295	}	295	}
296	return image;	296	return image;
Lines 318-328 Link Here
318	if (id == null) {	318	if (id == null) {
319	try {	319	try {
320	id = ImageDescriptor.createFromURL(new URL(_pluginBase,	320	id = ImageDescriptor.createFromURL(new URL(_pluginBase,
321	"icons/" + name));	321	"icons/" + name)); //$NON-NLS-1$
322	images.put(name, id);	322	images.put(name, id);
323	} catch (MalformedURLException ee) {	323	} catch (MalformedURLException ee) {
324	// log.CommonPlugin.image.error=Image {0} not found.	324	// log.CommonPlugin.image.error=Image {0} not found.
325	_log.error("log.msg", "log.CommonPlugin.image.error", name, ee);	325	_log.error("log.msg", "log.CommonPlugin.image.error", name, ee); //$NON-NLS-1$ //$NON-NLS-2$
326	}	326	}
327	}	327	}
328	return id;	328	return id;
Lines 370-391 Link Here
370	store.setDefault(P_CONSOLE_LOGGING, _properties.getProperty(	370	store.setDefault(P_CONSOLE_LOGGING, _properties.getProperty(
371	P_CONSOLE_LOGGING, Boolean.TRUE.toString()));	371	P_CONSOLE_LOGGING, Boolean.TRUE.toString()));
372	store.setDefault(P_CONSOLE_LOG_LEVEL, strToIntLogLevel(_properties	372	store.setDefault(P_CONSOLE_LOG_LEVEL, strToIntLogLevel(_properties
373	.getProperty(P_CONSOLE_LOG_LEVEL, "ERROR")));	373	.getProperty(P_CONSOLE_LOG_LEVEL, "ERROR"))); //$NON-NLS-1$
374		374
375	store.setDefault(P_ECLIPSE_LOGGING, _properties.getProperty(	375	store.setDefault(P_ECLIPSE_LOGGING, _properties.getProperty(
376	P_ECLIPSE_LOGGING, Boolean.TRUE.toString()));	376	P_ECLIPSE_LOGGING, Boolean.TRUE.toString()));
377	store.setDefault(P_ECLIPSE_LOG_LEVEL, strToIntLogLevel(_properties	377	store.setDefault(P_ECLIPSE_LOG_LEVEL, strToIntLogLevel(_properties
378	.getProperty(P_ECLIPSE_LOG_LEVEL, "ERROR")));	378	.getProperty(P_ECLIPSE_LOG_LEVEL, "ERROR"))); //$NON-NLS-1$
379		379
380	store.setDefault(P_FILE_LOGGING, _properties.getProperty(	380	store.setDefault(P_FILE_LOGGING, _properties.getProperty(
381	P_FILE_LOGGING, Boolean.FALSE.toString()));	381	P_FILE_LOGGING, Boolean.FALSE.toString()));
382	store.setDefault(P_FILE_LOG_LEVEL, strToIntLogLevel(_properties	382	store.setDefault(P_FILE_LOG_LEVEL, strToIntLogLevel(_properties
383	.getProperty(P_FILE_LOG_LEVEL, "ERROR")));	383	.getProperty(P_FILE_LOG_LEVEL, "ERROR"))); //$NON-NLS-1$
384	store.setDefault(P_FILE_PATH, _properties.getProperty(P_FILE_PATH, ""));	384	store.setDefault(P_FILE_PATH, _properties.getProperty(P_FILE_PATH, "")); //$NON-NLS-1$
385	store.setDefault(P_FILE_CLEAR, _properties.getProperty(P_FILE_CLEAR,	385	store.setDefault(P_FILE_CLEAR, _properties.getProperty(P_FILE_CLEAR,
386	Boolean.TRUE.toString()));	386	Boolean.TRUE.toString()));
387	store.setDefault(P_FILE_ROLLOVER_FREQUENCY, _properties.getProperty(	387	store.setDefault(P_FILE_ROLLOVER_FREQUENCY, _properties.getProperty(
388	P_FILE_ROLLOVER_FREQUENCY, "DAILY"));	388	P_FILE_ROLLOVER_FREQUENCY, "DAILY")); //$NON-NLS-1$
389	}	389	}
390		390
391	/**	391	/**
Lines 400-415 Link Here
400	if (str == null) {	400	if (str == null) {
401	return ERROR_LEVEL;	401	return ERROR_LEVEL;
402	}	402	}
403	if (str.equalsIgnoreCase("DEBUG")) {	403	if (str.equalsIgnoreCase("DEBUG")) { //$NON-NLS-1$
404	return DEBUG_LEVEL;	404	return DEBUG_LEVEL;
405	}	405	}
406	if (str.equalsIgnoreCase("INFO")) {	406	if (str.equalsIgnoreCase("INFO")) { //$NON-NLS-1$
407	return INFO_LEVEL;	407	return INFO_LEVEL;
408	}	408	}
409	if (str.equalsIgnoreCase("WARN")) {	409	if (str.equalsIgnoreCase("WARN")) { //$NON-NLS-1$
410	return WARN_LEVEL;	410	return WARN_LEVEL;
411	}	411	}
412	if (str.equalsIgnoreCase("FATAL")) {	412	if (str.equalsIgnoreCase("FATAL")) { //$NON-NLS-1$
413	return FATAL_LEVEL;	413	return FATAL_LEVEL;
414	}	414	}
415	return ERROR_LEVEL;	415	return ERROR_LEVEL;

Lines 20-95 Link Here

(-)src/org/eclipse/jst/jsf/common/ui/IFileFolderConstants.java (-14 / +14 lines)
20	/**	20	/**
21	* the dot character	21	* the dot character
22	*/	22	*/
23	public static final String DOT = ".";	23	public static final String DOT = "."; //$NON-NLS-1$
24		24
25	/**	25	/**
26	* the path separator	26	* the path separator
27	*/	27	*/
28	public static final String PATH_SEPARATOR = "/";	28	public static final String PATH_SEPARATOR = "/"; //$NON-NLS-1$
29		29
30	/** file extensions */	30	/** file extensions */
31	/**	31	/**
32	* class file extension	32	* class file extension
33	*/	33	*/
34	public static final String EXT_CLASS = "class";	34	public static final String EXT_CLASS = "class"; //$NON-NLS-1$
35		35
36	/**	36	/**
37	* jar file extension	37	* jar file extension
38	*/	38	*/
39	public static final String EXT_JAR = "jar";	39	public static final String EXT_JAR = "jar"; //$NON-NLS-1$
40		40
41	/**	41	/**
42	* java file extension	42	* java file extension
43	*/	43	*/
44	public static final String EXT_JAVA = "java";	44	public static final String EXT_JAVA = "java"; //$NON-NLS-1$
45		45
46		46
47	/**	47	/**
48	* jsp file extension	48	* jsp file extension
49	*/	49	*/
50	public static final String EXT_JSP = "jsp";	50	public static final String EXT_JSP = "jsp"; //$NON-NLS-1$
51		51
52	/**	52	/**
53	* properties file extension	53	* properties file extension
54	*/	54	*/
55	public static final String EXT_PROPERTIES = "properties";	55	public static final String EXT_PROPERTIES = "properties"; //$NON-NLS-1$
56		56
57	/**	57	/**
58	* taglib file extension	58	* taglib file extension
59	*/	59	*/
60	public static final String EXT_TAGLIB = "tld";	60	public static final String EXT_TAGLIB = "tld"; //$NON-NLS-1$
61		61
62	/**	62	/**
63	* standard web.xml file name	63	* standard web.xml file name
64	*/	64	*/
65	public static final String FILE_WEB_XML = "web.xml";	65	public static final String FILE_WEB_XML = "web.xml"; //$NON-NLS-1$
66		66
67	/** folders */	67	/** folders */
68		68
69	/**	69	/**
70	* classes folder name	70	* classes folder name
71	*/	71	*/
72	public static final String FOLDER_CLASS = "classes";	72	public static final String FOLDER_CLASS = "classes"; //$NON-NLS-1$
73		73
74	/**	74	/**
75	* icons folder name	75	* icons folder name
76	*/	76	*/
77	public static final String FOLDER_ICONS = "icons";	77	public static final String FOLDER_ICONS = "icons"; //$NON-NLS-1$
78		78
79	/**	79	/**
80	* the meta-inf folder name	80	* the meta-inf folder name
81	*/	81	*/
82	public static final String FOLDER_METAINF = "META-INF";	82	public static final String FOLDER_METAINF = "META-INF"; //$NON-NLS-1$
83		83
84	/**	84	/**
85	* the src folder name	85	* the src folder name
86	*/	86	*/
87	public static final String FOLDER_SOURCE = "src";	87	public static final String FOLDER_SOURCE = "src"; //$NON-NLS-1$
88		88
89	/**	89	/**
90	* the web-inf folder name	90	* the web-inf folder name
91	*/	91	*/
92	public static final String FOLDER_WEBINF = "WEB-INF";	92	public static final String FOLDER_WEBINF = "WEB-INF"; //$NON-NLS-1$
93		93
94	/** the webroot folder depth relative to the project */	94	/** the webroot folder depth relative to the project */
95	public static final int WEBROOT_FOLDER_DEPTH = 2;	95	public static final int WEBROOT_FOLDER_DEPTH = 2;

Lines 43-54 Link Here

(-)src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIFormInfo.java (-5 / +5 lines)
43	protected UIFormInfo(final ComponentInfo parent, ComponentTypeInfo componentTypeInfo,	43	protected UIFormInfo(final ComponentInfo parent, ComponentTypeInfo componentTypeInfo,
44	Map attributes)	44	Map attributes)
45	{	45	{
46	this(getStringProperty("id", attributes, true),	46	this(getStringProperty("id", attributes, true), //$NON-NLS-1$
47	parent,	47	parent,
48	componentTypeInfo,	48	componentTypeInfo,
49	getBooleanProperty("rendered", attributes),	49	getBooleanProperty("rendered", attributes), //$NON-NLS-1$
50	getBooleanProperty("prependId", attributes),	50	getBooleanProperty("prependId", attributes), //$NON-NLS-1$
51	getBooleanProperty("submitted", attributes));	51	getBooleanProperty("submitted", attributes)); //$NON-NLS-1$
52	}	52	}
53		53
54	/**	54	/**
Lines 71-76 Link Here
71		71
72	protected String getMostSpecificComponentName()	72	protected String getMostSpecificComponentName()
73	{	73	{
74	return "UIForm";	74	return "UIForm"; //$NON-NLS-1$
75	}	75	}
76	}	76	}

Lines 90-98 Link Here

(-)src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIInputInfo.java (-4 / +4 lines)
90	protected UIInputInfo(final ComponentInfo parent,	90	protected UIInputInfo(final ComponentInfo parent,
91	final ComponentTypeInfo typeInfo, Map attributes)	91	final ComponentTypeInfo typeInfo, Map attributes)
92	{	92	{
93	this(getStringProperty("id", attributes, true), parent, typeInfo,	93	this(getStringProperty("id", attributes, true), parent, typeInfo, //$NON-NLS-1$
94	getEditableValueHolderInfo("$editableValueHolderInfo",	94	getEditableValueHolderInfo("$editableValueHolderInfo", //$NON-NLS-1$
95	attributes), getBooleanProperty("rendered", attributes));	95	attributes), getBooleanProperty("rendered", attributes)); //$NON-NLS-1$
96	}	96	}
97		97
98	private static IEditableValueHolderInfo getEditableValueHolderInfo(	98	private static IEditableValueHolderInfo getEditableValueHolderInfo(
Lines 110-116 Link Here
110	// @Override	110	// @Override
111	protected String getMostSpecificComponentName()	111	protected String getMostSpecificComponentName()
112	{	112	{
113	return "UIInput";	113	return "UIInput"; //$NON-NLS-1$
114	}	114	}
115		115
116	public final boolean isValid()	116	public final boolean isValid()

Lines 68-111 Link Here

(-)src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentFactory.java (-28 / +28 lines)
68	/**	68	/**
69	* Base class name for UIInput's	69	* Base class name for UIInput's
70	*/	70	*/
71	public final static String BASE_CLASS_UIINPUT = "javax.faces.component.UIInput";	71	public final static String BASE_CLASS_UIINPUT = "javax.faces.component.UIInput"; //$NON-NLS-1$
72	/**	72	/**
73	* Base class name for UIOutput's	73	* Base class name for UIOutput's
74	*/	74	*/
75	public final static String BASE_CLASS_UIOUTPUT = "javax.faces.component.UIOutput";	75	public final static String BASE_CLASS_UIOUTPUT = "javax.faces.component.UIOutput"; //$NON-NLS-1$
76	/**	76	/**
77	* Base class name for UICommand's	77	* Base class name for UICommand's
78	*/	78	*/
79	public final static String BASE_CLASS_UICOMMAND = "javax.faces.component.UICommand";	79	public final static String BASE_CLASS_UICOMMAND = "javax.faces.component.UICommand"; //$NON-NLS-1$
80	/**	80	/**
81	* Base class name for UIData's	81	* Base class name for UIData's
82	*/	82	*/
83	public final static String BASE_CLASS_UIDATA = "javax.faces.component.UIData";	83	public final static String BASE_CLASS_UIDATA = "javax.faces.component.UIData"; //$NON-NLS-1$
84	/**	84	/**
85	* Base class name for UIForm's	85	* Base class name for UIForm's
86	*/	86	*/
87	public final static String BASE_CLASS_UIFORM = "javax.faces.component.UIForm";	87	public final static String BASE_CLASS_UIFORM = "javax.faces.component.UIForm"; //$NON-NLS-1$
88		88
89	/**	89	/**
90	* Interface name for ValueHolder's	90	* Interface name for ValueHolder's
91	*/	91	*/
92	public final static String INTERFACE_VALUEHOLDER = "javax.faces.component.ValueHolder";	92	public final static String INTERFACE_VALUEHOLDER = "javax.faces.component.ValueHolder"; //$NON-NLS-1$
93	/**	93	/**
94	* Interface name for EditableValueHolder's	94	* Interface name for EditableValueHolder's
95	*/	95	*/
96	public final static String INTERFACE_EDITABLEVALUEHOLDER = "javax.faces.component.EditableValueHolder";	96	public final static String INTERFACE_EDITABLEVALUEHOLDER = "javax.faces.component.EditableValueHolder"; //$NON-NLS-1$
97	/**	97	/**
98	* Interface name for ActionSource's	98	* Interface name for ActionSource's
99	*/	99	*/
100	public final static String INTERFACE_ACTIONSOURCE = "javax.faces.component.ActionSource";	100	public final static String INTERFACE_ACTIONSOURCE = "javax.faces.component.ActionSource"; //$NON-NLS-1$
101	/**	101	/**
102	* Interface name for ActionSource2's	102	* Interface name for ActionSource2's
103	*/	103	*/
104	public final static String INTERFACE_ACTIONSOURCE2 = "javax.faces.component.ActionSource2";	104	public final static String INTERFACE_ACTIONSOURCE2 = "javax.faces.component.ActionSource2"; //$NON-NLS-1$
105	/**	105	/**
106	* Interface name for NamingContainer's	106	* Interface name for NamingContainer's
107	*/	107	*/
108	public final static String INTERFACE_NAMINGCONTAINER = "javax.faces.component.NamingContainer";	108	public final static String INTERFACE_NAMINGCONTAINER = "javax.faces.component.NamingContainer"; //$NON-NLS-1$
109		109
110	/**	110	/**
111	* @param id	111	* @param id
Lines 128-136 Link Here
128	*/	128	*/
129	public static void maybeDefaultRendered(final Map attributes)	129	public static void maybeDefaultRendered(final Map attributes)
130	{	130	{
131	if (!(attributes.get("rendered") instanceof Boolean))	131	if (!(attributes.get("rendered") instanceof Boolean)) //$NON-NLS-1$
132	{	132	{
133	attributes.put("rendered", Boolean.TRUE);	133	attributes.put("rendered", Boolean.TRUE); //$NON-NLS-1$
134	}	134	}
135	}	135	}
136		136
Lines 270-286 Link Here
270		270
271	private static void maybeDefaultSubmitted(Map attributes)	271	private static void maybeDefaultSubmitted(Map attributes)
272	{	272	{
273	if (!(attributes.get("submitted") instanceof Boolean))	273	if (!(attributes.get("submitted") instanceof Boolean)) //$NON-NLS-1$
274	{	274	{
275	attributes.put("submitted", Boolean.FALSE);	275	attributes.put("submitted", Boolean.FALSE); //$NON-NLS-1$
276	}	276	}
277	}	277	}
278		278
279	private static void maybeDefaultPrependId(Map attributes)	279	private static void maybeDefaultPrependId(Map attributes)
280	{	280	{
281	if (!(attributes.get("prependId") instanceof Boolean))	281	if (!(attributes.get("prependId") instanceof Boolean)) //$NON-NLS-1$
282	{	282	{
283	attributes.put("prependId", Boolean.FALSE);	283	attributes.put("prependId", Boolean.FALSE); //$NON-NLS-1$
284	}	284	}
285	}	285	}
286		286
Lines 341-389 Link Here
341		341
342	private static void maybeDefaultFirst(Map attributes)	342	private static void maybeDefaultFirst(Map attributes)
343	{	343	{
344	if (!(attributes.get("first") instanceof Integer))	344	if (!(attributes.get("first") instanceof Integer)) //$NON-NLS-1$
345	{	345	{
346	attributes.put("first", ZERO);	346	attributes.put("first", ZERO); //$NON-NLS-1$
347	}	347	}
348	}	348	}
349		349
350	private static void maybeDefaultRowCount(Map attributes)	350	private static void maybeDefaultRowCount(Map attributes)
351	{	351	{
352	if (!(attributes.get("rowCount") instanceof Integer))	352	if (!(attributes.get("rowCount") instanceof Integer)) //$NON-NLS-1$
353	{	353	{
354	attributes.put("rowCount", MINUS_ONE);	354	attributes.put("rowCount", MINUS_ONE); //$NON-NLS-1$
355	}	355	}
356	}	356	}
357		357
358	private static void maybeDefaultRowAvailable(Map attributes)	358	private static void maybeDefaultRowAvailable(Map attributes)
359	{	359	{
360	if (! (attributes.get("rowAvailable") instanceof Boolean))	360	if (! (attributes.get("rowAvailable") instanceof Boolean)) //$NON-NLS-1$
361	{	361	{
362	attributes.put("rowAvailable", Boolean.FALSE);	362	attributes.put("rowAvailable", Boolean.FALSE); //$NON-NLS-1$
363	}	363	}
364	}	364	}
365		365
366	private static void maybeDefaultRowIndex(Map attributes)	366	private static void maybeDefaultRowIndex(Map attributes)
367	{	367	{
368	if (! (attributes.get("rowIndex") instanceof Integer))	368	if (! (attributes.get("rowIndex") instanceof Integer)) //$NON-NLS-1$
369	{	369	{
370	attributes.put("rowIndex", MINUS_ONE);	370	attributes.put("rowIndex", MINUS_ONE); //$NON-NLS-1$
371	}	371	}
372	}	372	}
373		373
374	private static void maybeDefaultRows(Map attributes)	374	private static void maybeDefaultRows(Map attributes)
375	{	375	{
376	if (! (attributes.get("rows") instanceof Integer))	376	if (! (attributes.get("rows") instanceof Integer)) //$NON-NLS-1$
377	{	377	{
378	attributes.put("rows", ZERO);	378	attributes.put("rows", ZERO); //$NON-NLS-1$
379	}	379	}
380	}	380	}
381		381
382	private static void maybeDefaultVar(Map attributes)	382	private static void maybeDefaultVar(Map attributes)
383	{	383	{
384	if (! (attributes.get("var") instanceof String))	384	if (! (attributes.get("var") instanceof String)) //$NON-NLS-1$
385	{	385	{
386	attributes.put("var", " default variable ");	386	attributes.put("var", " default variable "); //$NON-NLS-1$ //$NON-NLS-2$
387	}	387	}
388	}	388	}
389	}	389	}

Lines 17-27 Link Here

(-)src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIDataInfo.java (-16 / +16 lines)
17	/**	17	/**
18	* the standard name for the footer facet	18	* the standard name for the footer facet
19	*/	19	*/
20	public final static String FACET_NAME_FOOTER = "footer";	20	public final static String FACET_NAME_FOOTER = "footer"; //$NON-NLS-1$
21	/**	21	/**
22	* the standard name for the header facet.	22	* the standard name for the header facet.
23	*/	23	*/
24	public final static String FACET_NAME_HEADER = "header";	24	public final static String FACET_NAME_HEADER = "header"; //$NON-NLS-1$
25	/**	25	/**
26	* serialization id	26	* serialization id
27	*/	27	*/
Lines 93-112 Link Here
93	public UIDataInfo(final ComponentInfo parent,	93	public UIDataInfo(final ComponentInfo parent,
94	final ComponentTypeInfo componentTypeInfo, Map attributes)	94	final ComponentTypeInfo componentTypeInfo, Map attributes)
95	{	95	{
96	this(getStringProperty("id", attributes, true), parent,	96	this(getStringProperty("id", attributes, true), parent, //$NON-NLS-1$
97	componentTypeInfo,	97	componentTypeInfo,
98	getBooleanProperty("rendered", attributes),	98	getBooleanProperty("rendered", attributes), //$NON-NLS-1$
99	getDataModelInfo("$dataModel", attributes),	99	getDataModelInfo("$dataModel", attributes), //$NON-NLS-1$
100	getIntegerProperty("first", attributes),	100	getIntegerProperty("first", attributes), //$NON-NLS-1$
101	getComponentProperty("footer", attributes),	101	getComponentProperty("footer", attributes), //$NON-NLS-1$
102	getComponentProperty("header", attributes),	102	getComponentProperty("header", attributes), //$NON-NLS-1$
103	getIntegerProperty("rowCount", attributes),	103	getIntegerProperty("rowCount", attributes), //$NON-NLS-1$
104	getBooleanProperty("rowAvailable", attributes),	104	getBooleanProperty("rowAvailable", attributes), //$NON-NLS-1$
105	attributes.get("rowData"),	105	attributes.get("rowData"), //$NON-NLS-1$
106	getIntegerProperty("rowIndex", attributes),	106	getIntegerProperty("rowIndex", attributes), //$NON-NLS-1$
107	getIntegerProperty("rows", attributes),	107	getIntegerProperty("rows", attributes), //$NON-NLS-1$
108	attributes.get("value"),	108	attributes.get("value"), //$NON-NLS-1$
109	getStringProperty("var", attributes, true));	109	getStringProperty("var", attributes, true)); //$NON-NLS-1$
110	}	110	}
111		111
112	private static DataModelInfo getDataModelInfo(String key, Map attributes)	112	private static DataModelInfo getDataModelInfo(String key, Map attributes)
Lines 204-209 Link Here
204		204
205	protected String getMostSpecificComponentName()	205	protected String getMostSpecificComponentName()
206	{	206	{
207	return "UIData";	207	return "UIData"; //$NON-NLS-1$
208	}	208	}
209	}	209	}

Lines 63-72 Link Here

(-)src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UICommandInfo.java (-4 / +4 lines)
63	protected UICommandInfo(final ComponentInfo parent, final ComponentTypeInfo componentTypeInfo,	63	protected UICommandInfo(final ComponentInfo parent, final ComponentTypeInfo componentTypeInfo,
64	Map attributes)	64	Map attributes)
65	{	65	{
66	this(getStringProperty("id", attributes, true),	66	this(getStringProperty("id", attributes, true), //$NON-NLS-1$
67	parent, componentTypeInfo,	67	parent, componentTypeInfo,
68	getBooleanProperty("rendered", attributes),	68	getBooleanProperty("rendered", attributes), //$NON-NLS-1$
69	getActionSourceInfo("$actionSourceInfo", attributes)	69	getActionSourceInfo("$actionSourceInfo", attributes) //$NON-NLS-1$
70	);	70	);
71	}	71	}
72		72
Lines 102-107 Link Here
102		102
103	protected String getMostSpecificComponentName()	103	protected String getMostSpecificComponentName()
104	{	104	{
105	return "UICommand";	105	return "UICommand"; //$NON-NLS-1$
106	}	106	}
107	}	107	}

Lines 61-71 Link Here

(-)src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIOutputInfo.java (-4 / +4 lines)
61	protected UIOutputInfo(final ComponentInfo parent, final ComponentTypeInfo typeInfo,	61	protected UIOutputInfo(final ComponentInfo parent, final ComponentTypeInfo typeInfo,
62	final Map attributes)	62	final Map attributes)
63	{	63	{
64	this(getStringProperty("id", attributes, true),	64	this(getStringProperty("id", attributes, true), //$NON-NLS-1$
65	parent,	65	parent,
66	typeInfo,	66	typeInfo,
67	getValueHolderInfo("$valueHolderInfo", attributes),	67	getValueHolderInfo("$valueHolderInfo", attributes), //$NON-NLS-1$
68	getBooleanProperty("rendered", attributes));	68	getBooleanProperty("rendered", attributes)); //$NON-NLS-1$
69	}	69	}
70		70
71	/**	71	/**
Lines 81-87 Link Here
81		81
82	// @Override	82	// @Override
83	protected String getMostSpecificComponentName() {	83	protected String getMostSpecificComponentName() {
84	return "UIOutput";	84	return "UIOutput"; //$NON-NLS-1$
85	}	85	}
86		86
87	public final ConverterDecorator getConverter() {	87	public final ConverterDecorator getConverter() {

Lines 32-38 Link Here

(-)src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ConverterTypeInfo.java (-3 / +3 lines)
32	if (className == null && converterId == null)	32	if (className == null && converterId == null)
33	{	33	{
34	throw new IllegalArgumentException(	34	throw new IllegalArgumentException(
35	"converterClass and converterId must not both be null. For unknown validator use the UNKNOWN constant");	35	"converterClass and converterId must not both be null. For unknown validator use the UNKNOWN constant"); //$NON-NLS-1$
36	}	36	}
37		37
38	_converterId = converterId;	38	_converterId = converterId;
Lines 56-62 Link Here
56	if (className == null && converterId == null)	56	if (className == null && converterId == null)
57	{	57	{
58	throw new IllegalArgumentException(	58	throw new IllegalArgumentException(
59	"converterClass and converterId must not both be null. For unknown validator use the UNKNOWN constant");	59	"converterClass and converterId must not both be null. For unknown validator use the UNKNOWN constant"); //$NON-NLS-1$
60	}	60	}
61		61
62	_converterId = converterId;	62	_converterId = converterId;
Lines 93-98 Link Here
93		93
94	public String toString()	94	public String toString()
95	{	95	{
96	return "Converter Type Info: type = " + _converterId + ", "+super.toString();	96	return "Converter Type Info: type = " + _converterId + ", "+super.toString(); //$NON-NLS-1$ //$NON-NLS-2$
97	}	97	}
98	}	98	}

Lines 30-36 Link Here

(-)src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValidatorTypeInfo.java (-3 / +3 lines)
30		30
31	if (validatorClass == null && validatorId == null)	31	if (validatorClass == null && validatorId == null)
32	{	32	{
33	throw new IllegalArgumentException("validatorClass and validatorId must not both be null. For unknown validator use the UNKNOWN constant");	33	throw new IllegalArgumentException("validatorClass and validatorId must not both be null. For unknown validator use the UNKNOWN constant"); //$NON-NLS-1$
34	}	34	}
35	_validatorId = validatorId;	35	_validatorId = validatorId;
36	}	36	}
Lines 52-58 Link Here
52		52
53	if (validatorClass == null && validatorId == null)	53	if (validatorClass == null && validatorId == null)
54	{	54	{
55	throw new IllegalArgumentException("validatorClass and validatorId must not both be null. For unknown validator use the UNKNOWN constant");	55	throw new IllegalArgumentException("validatorClass and validatorId must not both be null. For unknown validator use the UNKNOWN constant"); //$NON-NLS-1$
56	}	56	}
57	_validatorId = validatorId;	57	_validatorId = validatorId;
58	}	58	}
Lines 87-93 Link Here
87		87
88	public String toString()	88	public String toString()
89	{	89	{
90	return "Validator Type Info: type = " + _validatorId + ", "+super.toString();	90	return "Validator Type Info: type = " + _validatorId + ", "+super.toString(); //$NON-NLS-1$ //$NON-NLS-2$
91	}	91	}
92		92
93	}	93	}

Lines 361-367 Link Here

(-)src/org/eclipse/jst/jsf/common/runtime/internal/model/ViewObject.java (-9 / +9 lines)
361		361
362	if (decorator == null \|\| associatedType == null)	362	if (decorator == null \|\| associatedType == null)
363	{	363	{
364	throw new IllegalArgumentException("Arguments must not be null");	364	throw new IllegalArgumentException("Arguments must not be null"); //$NON-NLS-1$
365	}	365	}
366		366
367	final List decoratorsByType = (List) getDecoratorMap().get(	367	final List decoratorsByType = (List) getDecoratorMap().get(
Lines 385-402 Link Here
385		385
386	if (adapterType == null \|\| adapter == null)	386	if (adapterType == null \|\| adapter == null)
387	{	387	{
388	throw new IllegalArgumentException("Arguments must not be null");	388	throw new IllegalArgumentException("Arguments must not be null"); //$NON-NLS-1$
389	}	389	}
390		390
391	if (!adapterType.isInstance(adapter))	391	if (!adapterType.isInstance(adapter))
392	{	392	{
393	throw new IllegalArgumentException("adapter: " + adapter	393	throw new IllegalArgumentException("adapter: " + adapter //$NON-NLS-1$
394	+ " must be cast compatible to class: " + adapterType);	394	+ " must be cast compatible to class: " + adapterType); //$NON-NLS-1$
395	}	395	}
396	else if (adapterType.isInstance(_owner))	396	else if (adapterType.isInstance(_owner))
397	{	397	{
398	throw new IllegalArgumentException("this: " + _owner	398	throw new IllegalArgumentException("this: " + _owner //$NON-NLS-1$
399	+ " must not already be an instance of class: "	399	+ " must not already be an instance of class: " //$NON-NLS-1$
400	+ adapterType);	400	+ adapterType);
401	}	401	}
402	getAdapterMap().put(adapterType, adapter);	402	getAdapterMap().put(adapterType, adapter);
Lines 411-417 Link Here
411		411
412	if (decorator == null)	412	if (decorator == null)
413	{	413	{
414	throw new IllegalArgumentException("Arguments must not be null");	414	throw new IllegalArgumentException("Arguments must not be null"); //$NON-NLS-1$
415	}	415	}
416	final Class associationType = decorator.getClass();	416	final Class associationType = decorator.getClass();
417	addDecorator(decorator, associationType);	417	addDecorator(decorator, associationType);
Lines 427-433 Link Here
427		427
428	if (decorator == null \|\| associatedType == null)	428	if (decorator == null \|\| associatedType == null)
429	{	429	{
430	throw new IllegalArgumentException("Arguments must not be null");	430	throw new IllegalArgumentException("Arguments must not be null"); //$NON-NLS-1$
431	}	431	}
432		432
433	List decoratorsByType = (List) getDecoratorMap().get(associatedType);	433	List decoratorsByType = (List) getDecoratorMap().get(associatedType);
Lines 500-506 Link Here
500	{	500	{
501	if (isProtected())	501	if (isProtected())
502	{	502	{
503	throw new UnsupportedOperationException("Object "+this.toString()+ " is locked for modification");	503	throw new UnsupportedOperationException("Object "+this.toString()+ " is locked for modification"); //$NON-NLS-1$ //$NON-NLS-2$
504	}	504	}
505	}	505	}
506		506

Lines 1-4 Link Here

(-).settings/org.eclipse.jdt.core.prefs (-2 / +5 lines)
1	#Wed Jan 09 14:34:02 PST 2008	1	#Tue Apr 22 16:19:01 PDT 2008
2	eclipse.preferences.version=1	2	eclipse.preferences.version=1
3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled	3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2	4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
Lines 45-51 Link Here
45	org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning	45	org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
46	org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning	46	org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
47	org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning	47	org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
48	org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore	48	org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
49	org.eclipse.jdt.core.compiler.problem.nullReference=ignore	49	org.eclipse.jdt.core.compiler.problem.nullReference=ignore
50	org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning	50	org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
51	org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore	51	org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
Lines 53-58 Link Here
53	org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore	53	org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
54	org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore	54	org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
55	org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore	55	org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
		56	org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
56	org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled	57	org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
57	org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning	58	org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
58	org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled	59	org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
Lines 65-70 Link Here
65	org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning	66	org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
66	org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore	67	org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
67	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning	68	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
		69	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
68	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled	70	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
69	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled	71	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
70	org.eclipse.jdt.core.compiler.problem.unusedImport=error	72	org.eclipse.jdt.core.compiler.problem.unusedImport=error
Lines 75-79 Link Here
75	org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled	77	org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
76	org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled	78	org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
77	org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error	79	org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
		80	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
78	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning	81	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
79	org.eclipse.jdt.core.compiler.source=1.3	82	org.eclipse.jdt.core.compiler.source=1.3

Lines 31-42 Link Here

(-)src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/converter/operations/SelectShuttleOperation.java (-10 / +11 lines)
31	*/	31	*/
32	public class SelectShuttleOperation extends AbstractTrinidadTransformOperation {	32	public class SelectShuttleOperation extends AbstractTrinidadTransformOperation {
33		33
34	private static final String STYLE_HEADER = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:9pt;color:#669966;font-weight:bold;padding:0px 0px 0px 18px;";	34	private static final String STYLE_HEADER = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:9pt;color:#669966;font-weight:bold;padding:0px 0px 0px 18px;"; //$NON-NLS-1$
35	private static final String STYLE_REQUIRED = "color:#669966;font-family:Courier,sans-serif;";	35	private static final String STYLE_REQUIRED = "color:#669966;font-family:Courier,sans-serif;"; //$NON-NLS-1$
36	private static final String STYLE_LISTCOLUMN = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:normal;";	36	private static final String STYLE_LISTCOLUMN = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:normal;"; //$NON-NLS-1$
37	private static final String STYLE_SELECT = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:normal;color:#000000;";	37	private static final String STYLE_SELECT = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:normal;color:#000000;"; //$NON-NLS-1$
38	private static final String STYLE_DESCRIPTION = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:normal;color:#000000;";	38	private static final String STYLE_DESCRIPTION = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:normal;color:#000000;"; //$NON-NLS-1$
39	private static final String STYLE_LINK = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:normal;color:#003333;";	39	private static final String STYLE_LINK = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:normal;color:#003333;"; //$NON-NLS-1$
		40	private static final String DEFAULT_SIZE = "10"; //$NON-NLS-1$
40		41
41	private static final String[] LINKS_MOVE = new String[]{	42	private static final String[] LINKS_MOVE = new String[]{
42	Messages.SelectShuttleOperation_LinkMove,	43	Messages.SelectShuttleOperation_LinkMove,
Lines 205-213 Link Here
205	//build footer structure	206	//build footer structure
206	String footerFacetName;	207	String footerFacetName;
207	if (isLeadingColumn) {	208	if (isLeadingColumn) {
208	footerFacetName = "leadingFooter";	209	footerFacetName = "leadingFooter"; //$NON-NLS-1$
209	} else {	210	} else {
210	footerFacetName = "trailingFooter";	211	footerFacetName = "trailingFooter"; //$NON-NLS-1$
211	}	212	}
212	Element footerFacet = getChildFacetByName(srcElement, footerFacetName); //$NON-NLS-1$	213	Element footerFacet = getChildFacetByName(srcElement, footerFacetName); //$NON-NLS-1$
213	if (footerFacet != null) {	214	if (footerFacet != null) {
Lines 238-245 Link Here
238	}	239	}
239		240
240	private String getSizeString(Element srcElement) {	241	private String getSizeString(Element srcElement) {
241	String size = "10";	242	String size = DEFAULT_SIZE;
242	String sizeAttr = srcElement.getAttribute("size");	243	String sizeAttr = srcElement.getAttribute("size"); //$NON-NLS-1$
243	if (sizeAttr != null && sizeAttr.length() > 0) {	244	if (sizeAttr != null && sizeAttr.length() > 0) {
244	try {	245	try {
245	int iSize = Integer.parseInt(sizeAttr);	246	int iSize = Integer.parseInt(sizeAttr);

Lines 31-42 Link Here

(-)facesconfig/org/eclipse/jst/jsf/facesconfig/FacesConfigPlugin.java (-2 / +2 lines)
31	* <!-- end-user-doc -->	31	* <!-- end-user-doc -->
32	* @generated	32	* @generated
33	*/	33	*/
34	public static final String copyright = "Copyright (c) 2005, 2006 IBM Corporation and others";	34	public static final String copyright = "Copyright (c) 2005, 2006 IBM Corporation and others"; //$NON-NLS-1$
35		35
36	/**	36	/**
37	* Editor id string. TODO: broken?	37	* Editor id string. TODO: broken?
38	*/	38	*/
39	public static final String FACES_CONFIG_EDITOR_ID = "org.eclipse.jst.jsf.facesconfig.internal.presentation.FacesConfigEditor";	39	public static final String FACES_CONFIG_EDITOR_ID = "org.eclipse.jst.jsf.facesconfig.internal.presentation.FacesConfigEditor"; //$NON-NLS-1$
40		40
41	/**	41	/**
42	* The plugin instance	42	* The plugin instance