Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 186204 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/pde/internal/build/BuildScriptGenerator.java (-3 / +3 lines)
Lines 137-146 Link Here
137 
				generator.setIgnoreMissingPropertiesFile(ignoreMissingPropertiesFile);
 137 
				generator.setIgnoreMissingPropertiesFile(ignoreMissingPropertiesFile);
138 
				//Filtering is not required here, since we are only generating the
 138 
				//Filtering is not required here, since we are only generating the
139 
				// build for a plugin or a fragment
 139 
				// build for a plugin or a fragment
140 
				String model = (String) iterator.next();
 140 
				String[] modelInfo = getNameAndVersion((String) iterator.next());
141 
				generator.setBuildSiteFactory(siteFactory);
 141 
				generator.setBuildSiteFactory(siteFactory);
142 
				generator.setModelId(model);
 142 
				generator.setModelId(modelInfo[0], modelInfo[1]);
143 


              143
              
				

            

        

          144
          
				generator.setPluginPath(pluginPath);

          144
          
				generator.setPluginPath(pluginPath);

        

        

          145
          
				generator.setDevEntries(devEntries);

          145
          
				generator.setDevEntries(devEntries);

        

        

          146
          
				generator.setCompiledElements(generator.getCompiledElements());

          146
          
				generator.setCompiledElements(generator.getCompiledElements());

        



(-)src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java
      (-4 / +6 lines)




  

    
      
            Lines 789-796
          
      
      
        Link Here
      
    
  

        

          789
          
	 * @param modelId

          789
          
	 * @param modelId

        

        

          790
          
	 * @throws CoreException

          790
          
	 * @throws CoreException

        

        

          791
          
	 */

          791
          
	 */

        

          
            

              792
              
	public void setModelId(String modelId) throws CoreException {


              792
              
	public void setModelId(String modelId, String modelVersion) throws CoreException {

            

            

              793
              
		BundleDescription newModel = getModel(modelId);


              793
              
		BundleDescription newModel = getModel(modelId, modelVersion);

            

        

          794
          
		if (newModel == null) {

          794
          
		if (newModel == null) {

        

        

          795
          
			String message = NLS.bind(Messages.exception_missingElement, modelId);

          795
          
			String message = NLS.bind(Messages.exception_missingElement, modelId);

        

        

          796
          
			throw new CoreException(new Status(IStatus.ERROR, PI_PDEBUILD, EXCEPTION_ELEMENT_MISSING, message, null));

          796
          
			throw new CoreException(new Status(IStatus.ERROR, PI_PDEBUILD, EXCEPTION_ELEMENT_MISSING, message, null));

        

  

    
      
            Lines 1295-1302
          
      
      
        Link Here
      
    
  

        

          1295
          
	 * @param modelId the identifier of the model object to lookup

          1295
          
	 * @param modelId the identifier of the model object to lookup

        

        

          1296
          
	 * @return the model object or <code>null</code>

          1296
          
	 * @return the model object or <code>null</code>

        

        

          1297
          
	 */

          1297
          
	 */

        

          
            

              1298
              
	protected BundleDescription getModel(String modelId) throws CoreException {


              1298
              
	protected BundleDescription getModel(String modelId, String modelVersion) throws CoreException {

            

            

              1299
              
		return getSite(false).getRegistry().getResolvedBundle(modelId);


              1299
              
		if (modelVersion == null)

            

            

              
              

              1300
              
			return getSite(false).getRegistry().getResolvedBundle(modelId);

            

            


              1301
              
		return getSite(false).getRegistry().getResolvedBundle(modelId, modelVersion);

            

        

          1300
          
	}

          1302
          
	}

        

        

          1301
          

          1303
          

        

        

          1302
          
	public IPluginEntry getAssociatedEntry() {

          1304
          
	public IPluginEntry getAssociatedEntry() {

        






  

  Return to bug 186204