Automated merge with https://hg.netbeans.org/main/contrib/
authorJesse Glick <jglick@netbeans.org>
Mon, 26 Mar 2012 11:00:22 -0400
changeset 17804506d7b5e9905
parent 17802 6740b75b4ebc
parent 17803 d0cdc71cfd8f
child 17805 06b3b107c655
Automated merge with https://hg.netbeans.org/main/contrib/
     1.1 --- a/autoproject.web/src/org/netbeans/modules/autoproject/web/WebModuleImpl.java	Sun Mar 25 21:26:36 2012 +0200
     1.2 +++ b/autoproject.web/src/org/netbeans/modules/autoproject/web/WebModuleImpl.java	Mon Mar 26 11:00:22 2012 -0400
     1.3 @@ -74,23 +74,23 @@
     1.4          this.cpProvider = cpProvider;
     1.5      }
     1.6  
     1.7 -    public FileObject getDocumentBase() {
     1.8 +    @Override public FileObject getDocumentBase() {
     1.9          return docBase;
    1.10      }
    1.11  
    1.12 -    public String getContextPath() {
    1.13 +    @Override public String getContextPath() {
    1.14          return "UNKNOWN"; // XXX: will have to ask user for context
    1.15      }
    1.16  
    1.17 -    public Profile getJ2eeProfile() {
    1.18 +    @Override public Profile getJ2eeProfile() {
    1.19          return Profile.JAVA_EE_5; // XXX: will have to ask user
    1.20      }
    1.21  
    1.22 -    public FileObject getWebInf() {
    1.23 +    @Override public FileObject getWebInf() {
    1.24          return getFile(WebCacheConstants.WEBINF);
    1.25      }
    1.26  
    1.27 -    public FileObject getDeploymentDescriptor() {
    1.28 +    @Override public FileObject getDeploymentDescriptor() {
    1.29          return getFile(WebCacheConstants.WEB_XML);
    1.30      }
    1.31      
    1.32 @@ -102,11 +102,11 @@
    1.33          return null;
    1.34      }
    1.35  
    1.36 -    public FileObject[] getJavaSources() {
    1.37 +    @Override public FileObject[] getJavaSources() {
    1.38          return new FileObject[0];
    1.39      }
    1.40  
    1.41 -    public MetadataModel<WebAppMetadata> getMetadataModel() {
    1.42 +    @Override public MetadataModel<WebAppMetadata> getMetadataModel() {
    1.43          if (webAppMetadataModel == null) {
    1.44              File rt = new File(root);
    1.45              FileObject ddFO = getDeploymentDescriptor();
    1.46 @@ -122,7 +122,7 @@
    1.47          return webAppMetadataModel;
    1.48      }
    1.49  
    1.50 -    public String getModuleVersion() {
    1.51 +    @Override public String getModuleVersion() {
    1.52          WebApp wapp = getWebApp ();
    1.53          String version = WebApp.VERSION_2_5;
    1.54          if (wapp != null)
    1.55 @@ -142,28 +142,28 @@
    1.56          return null;
    1.57      }
    1.58  
    1.59 -    public J2eeModule.Type getModuleType() {
    1.60 +    @Override public J2eeModule.Type getModuleType() {
    1.61          return J2eeModule.Type.WAR;
    1.62      }
    1.63  
    1.64 -    public String getUrl() {
    1.65 +    @Override public String getUrl() {
    1.66          return ""; // XXX
    1.67      }
    1.68  
    1.69 -    public FileObject getArchive() throws IOException {
    1.70 +    @Override public FileObject getArchive() throws IOException {
    1.71          return getFile(WebCacheConstants.WAR_FILE);
    1.72      }
    1.73  
    1.74 -    public Iterator getArchiveContents() throws IOException {
    1.75 +    @Override public Iterator<J2eeModule.RootedEntry> getArchiveContents() throws IOException {
    1.76          // no incremental deployment
    1.77          throw new UnsupportedOperationException("Not supported yet.");
    1.78      }
    1.79  
    1.80 -    public FileObject getContentDirectory() throws IOException {
    1.81 +    @Override public FileObject getContentDirectory() throws IOException {
    1.82          return null;
    1.83      }
    1.84  
    1.85 -    public <T> MetadataModel<T> getMetadataModel(Class<T> type) {
    1.86 +    @Override public <T> MetadataModel<T> getMetadataModel(Class<T> type) {
    1.87          if (type == WebAppMetadata.class) {
    1.88              @SuppressWarnings("unchecked") // NOI18N
    1.89              MetadataModel<T> model = (MetadataModel<T>)getMetadataModel();
    1.90 @@ -172,12 +172,12 @@
    1.91          return null;
    1.92      }
    1.93  
    1.94 -    public File getResourceDirectory() {
    1.95 +    @Override public File getResourceDirectory() {
    1.96          // XXX: do not have any
    1.97          throw new UnsupportedOperationException(); // XXX
    1.98      }
    1.99  
   1.100 -    public File getDeploymentConfigurationFile(String name) {
   1.101 +    @Override public File getDeploymentConfigurationFile(String name) {
   1.102         if (name == null) {
   1.103              return null;
   1.104          }
   1.105 @@ -201,11 +201,11 @@
   1.106          return null;
   1.107      }
   1.108  
   1.109 -    public void addPropertyChangeListener(PropertyChangeListener listener) {
   1.110 +    @Override public void addPropertyChangeListener(PropertyChangeListener listener) {
   1.111          // TODO
   1.112      }
   1.113  
   1.114 -    public void removePropertyChangeListener(PropertyChangeListener listener) {
   1.115 +    @Override public void removePropertyChangeListener(PropertyChangeListener listener) {
   1.116          // TODO
   1.117      }
   1.118