[jbosstools-commits] JBoss Tools SVN: r39033 - in trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools: filesets/vcf and 1 other directories.

Author: rob.stryker(a)jboss.com Date: 2012-02-23 03:10:33 -0500 (Thu, 23 Feb 2012) New Revision: 39033 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/NewServerFilesetHandler.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/FilesetComponentResolver.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/FilesetVCLabelProvider.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/WorkspaceFilesetVirtualComponent.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModelModuleContributor.java Log: JBIDE-11010 - error handling Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/NewServerFilesetHandler.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/NewServerFilesetHandler.java 2012-02-23 07:53:30 UTC (rev 39032) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/NewServerFilesetHandler.java 2012-02-23 08:10:33 UTC (rev 39033) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.archives.webtools.filesets; import java.io.IOException; Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/FilesetComponentResolver.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/FilesetComponentResolver.java 2012-02-23 07:53:30 UTC (rev 39032) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/FilesetComponentResolver.java 2012-02-23 08:10:33 UTC (rev 39033) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.archives.webtools.filesets.vcf; import java.io.UnsupportedEncodingException; @@ -46,7 +56,6 @@ path = includes = excludes = null; try { for( int i = 0; i < split.length; i++ ) { - boolean hasEquals = split[i].contains("="); //$NON-NLS-1$ String pre = split[i].substring(0, split[i].indexOf("=")); //$NON-NLS-1$ String post = split[i].substring(split[i].indexOf("=") + 1); //$NON-NLS-1$ post = URLDecoder.decode(post, "UTF-8"); //$NON-NLS-1$ @@ -57,15 +66,18 @@ else if( "excludes".equals(pre)) //$NON-NLS-1$ excludes = post; } - } catch( UnsupportedEncodingException uee) {} - WorkspaceFilesetVirtualComponent comp = new WorkspaceFilesetVirtualComponent(p, context, path); - comp.setIncludes(includes); - comp.setExcludes(excludes); - IVirtualReference ref = ComponentCore.createReference(context, comp); - ref.setArchiveName(referencedComponent.getArchiveName()); - ref.setRuntimePath(referencedComponent.getRuntimePath()); - ref.setDependencyType(referencedComponent.getDependencyType().getValue()); - return ref; + WorkspaceFilesetVirtualComponent comp = new WorkspaceFilesetVirtualComponent(p, context, path); + comp.setIncludes(includes); + comp.setExcludes(excludes); + IVirtualReference ref = ComponentCore.createReference(context, comp); + ref.setArchiveName(referencedComponent.getArchiveName()); + ref.setRuntimePath(referencedComponent.getRuntimePath()); + ref.setDependencyType(referencedComponent.getDependencyType().getValue()); + return ref; + } catch( UnsupportedEncodingException uee) { + // Impossible, since I've hard-coded UTF-8 here. + return null; + } } public ReferencedComponent resolve(IVirtualReference reference) { @@ -86,10 +98,10 @@ rc.setHandle(URI.createURI(fsvc.getId() + url)); rc.setDependencyType(DependencyType.CONSUMES_LITERAL); return rc; - - } catch( UnsupportedEncodingException uee) {} - int x = 5; - return null; + } catch( UnsupportedEncodingException uee) { + // This should never happen, since I am hard-coding in UTF-8. + return null; + } } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/FilesetVCLabelProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/FilesetVCLabelProvider.java 2012-02-23 07:53:30 UTC (rev 39032) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/FilesetVCLabelProvider.java 2012-02-23 08:10:33 UTC (rev 39033) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.archives.webtools.filesets.vcf; import org.eclipse.swt.graphics.Image; Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/WorkspaceFilesetVirtualComponent.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/WorkspaceFilesetVirtualComponent.java 2012-02-23 07:53:30 UTC (rev 39032) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/WorkspaceFilesetVirtualComponent.java 2012-02-23 08:10:33 UTC (rev 39033) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.archives.webtools.filesets.vcf; import org.eclipse.core.resources.IContainer; Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModelModuleContributor.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModelModuleContributor.java 2012-02-23 07:53:30 UTC (rev 39032) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModelModuleContributor.java 2012-02-23 08:10:33 UTC (rev 39033) @@ -94,6 +94,9 @@ ArchivesModel.instance().getRoot(project.getLocation()).save( new NullProgressMonitor()); } catch( ArchivesModelException ame ) { + // I have no idea how often this will happen, and I am not willing + // to currently log an error which may be very common and is curentl + // ignored since it will not affect users in this specific case. } } }