Skip to content

Commit 978fd3c

Browse files
eclipse-pde-botakurtakov
authored andcommitted
Perform clean code of build/org.eclipse.pde.build
1 parent 883554f commit 978fd3c

File tree

92 files changed

+485
-485
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+485
-485
lines changed

build/org.eclipse.pde.build/src/org/eclipse/pde/build/Constants.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public interface Constants {
3333
public final static String BUNDLE_FILENAME_DESCRIPTOR = "META-INF/MANIFEST.MF"; //$NON-NLS-1$
3434

3535
/**
36-
* Key used to store the value of a project reference in the Eclipse-SourceReferences manifest header.
37-
*
36+
* Key used to store the value of a project reference in the Eclipse-SourceReferences manifest header.
37+
*
3838
* @since 3.6
3939
* @see IFetchFactory
4040
*/

build/org.eclipse.pde.build/src/org/eclipse/pde/build/IAntScript.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
import java.util.Map;
1818

1919
/**
20-
* Interface providing helper methods to produce Ant scripts.
21-
* <p>
22-
* It contains convenience methods for creating the XML elements
23-
* required for Ant scripts. See the <a href="http://ant.apache.org">Ant</a>
20+
* Interface providing helper methods to produce Ant scripts.
21+
* <p>
22+
* It contains convenience methods for creating the XML elements
23+
* required for Ant scripts. See the <a href="http://ant.apache.org">Ant</a>
2424
* website for more details on Ant scripts and the particular Ant tasks.
2525
* </p>
2626
* @noimplement This interface is not intended to be implemented by clients.
@@ -29,21 +29,21 @@ public interface IAntScript {
2929

3030
/**
3131
* Print the given string to the Ant script.
32-
*
32+
*
3333
* @param string the string to print.
3434
*/
3535
public void print(String string);
3636

3737
/**
3838
* Print the given comment to the Ant script folled by a carriage-return.
39-
*
39+
*
4040
* @param comment the comment to print.
4141
*/
4242
public void printComment(String comment);
4343

4444
/**
4545
* Print the given string followed by a carriage-return.
46-
*
46+
*
4747
* @param string the string to print.
4848
*/
4949
public void println(String string);
@@ -65,8 +65,8 @@ public interface IAntScript {
6565
* Print an XML attribute. <code>name=value</code>.
6666
* @param name the name of the attribute to print. This value can not be <code>null</code>.
6767
* @param value the name of the value to print. This value can be <code>null</code>.
68-
* @param mandatory indicate whether or not the value is mandatory.
69-
* If the <code>value</code> is <code>null</code> and the attribute is mandatory, the printed value will be "".
68+
* @param mandatory indicate whether or not the value is mandatory.
69+
* If the <code>value</code> is <code>null</code> and the attribute is mandatory, the printed value will be "".
7070
*/
7171
public void printAttribute(String name, String value, boolean mandatory);
7272

@@ -116,7 +116,7 @@ public interface IAntScript {
116116
public void decrementIdent();
117117

118118
/**
119-
* Print a target declaration. See <a href="http://ant.apache.org/manual/using.html#targets">Ant's targets</a>.
119+
* Print a target declaration. See <a href="http://ant.apache.org/manual/using.html#targets">Ant's targets</a>.
120120
* @param name the name of the target. This value can not be <code>null</code>.
121121
* @param depends a comma-separated list of names of targets on which this target depends. This value can be <code>null</code>.
122122
* @param ifClause the name of the property that must be set in order for this target to execute. This value can be <code>null</code>

build/org.eclipse.pde.build/src/org/eclipse/pde/build/IFetchFactory.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,21 @@
2424
* Interface to be implemented by clients of the <code>org.eclipse.pde.build.fetchFactories</code> extension-point.
2525
* <p>
2626
* The factories are being used at various points in the execution of the PDE Build <code>eclipse.fetch</code> Ant task.
27-
* Based on a map file entry, they are responsible for generating segments of an ant script whose execution will fetch
27+
* Based on a map file entry, they are responsible for generating segments of an ant script whose execution will fetch
2828
* plug-ins, fragments, bundles and features or individual files contained in one of those elements.
2929
* The format of a map file entry is:
3030
* <code>
3131
* &lt;elementType&gt;@&lt;elementName&gt; = &lt;repositoryTag&gt;, &lt;repositoryDetails&gt;
3232
* </code>
3333
* The format of <code>elementType</code> and <code>elementName</code> is fixed.
3434
* The factories specify the value of <code>repositoryTag</code> and the format of the <code>repositoryDetails</code>.
35-
* <code>repositoryTag</code> and <code>repositoryDetails</code> becomes defacto APIs.
35+
* <code>repositoryTag</code> and <code>repositoryDetails</code> becomes defacto APIs.
3636
* <br>
37-
* <code>repositoryTag</code> should match the factory id used when declaring the factory extension. For example, for the CVS the value is "CVS".
37+
* <code>repositoryTag</code> should match the factory id used when declaring the factory extension. For example, for the CVS the value is "CVS".
3838
* <code>repositoryDetails</code> should contains enough details to allow the factory to generate a fetch script retrieving the element.
3939
* </p>
4040
* <p>
41-
* The fetch factories are being contributed through the <code>org.eclipse.pde.build.fetchFactories</code>
41+
* The fetch factories are being contributed through the <code>org.eclipse.pde.build.fetchFactories</code>
4242
* extension-points.
4343
* </p>
4444
* <p>
@@ -87,16 +87,16 @@ public interface IFetchFactory {
8787
* required in later processing to sucessfully generate the fetch script.
8888
* </p>
8989
* <p>
90-
* Since 3.6, factories may optionally set the {@link Constants#KEY_SOURCE_REFERENCES} property in the entry infos map to support the inclusion
90+
* Since 3.6, factories may optionally set the {@link Constants#KEY_SOURCE_REFERENCES} property in the entry infos map to support the inclusion
9191
* of source references in the bundle manifest using the Eclipse-SourceReferences header.
9292
* </p>
9393
* @param rawEntry the arguments as specified in the map file (may not be <code>null</code>).
94-
* @param overrideTags a key / value containing all the override tags specified for all the repository (maybe <code>null</code> or empty).
95-
* The values of this map of this are read from the fetchTag property (see file scripts/templates/headless-build/build.properties).
96-
* @param entryInfos the map to store repository specific information derived from the rawEntry.This object is being passed as arguments to
97-
* the other methods of the factory. The factories are also expected to set {@link #KEY_ELEMENT_TAG} to indicate the tag that will be used
98-
* to fetch the element. This value is for example used to generate the "qualifier" value of a version number.
99-
* Note that {@link #KEY_ELEMENT_NAME} and {@link #KEY_ELEMENT_TYPE} are reserved entries whose values respectively
94+
* @param overrideTags a key / value containing all the override tags specified for all the repository (maybe <code>null</code> or empty).
95+
* The values of this map of this are read from the fetchTag property (see file scripts/templates/headless-build/build.properties).
96+
* @param entryInfos the map to store repository specific information derived from the rawEntry.This object is being passed as arguments to
97+
* the other methods of the factory. The factories are also expected to set {@link #KEY_ELEMENT_TAG} to indicate the tag that will be used
98+
* to fetch the element. This value is for example used to generate the "qualifier" value of a version number.
99+
* Note that {@link #KEY_ELEMENT_NAME} and {@link #KEY_ELEMENT_TYPE} are reserved entries whose values respectively
100100
* refer to the name of the element being fetched and its type.
101101
* @throws CoreException if the rawEntry is incorrect.
102102
*/
@@ -108,8 +108,8 @@ public interface IFetchFactory {
108108
* @param entryInfos the map that has been built in the {@link #parseMapFileEntry(String, Properties, Map)} method.
109109
* This map contains the name and the type of the element (resp. {@link #KEY_ELEMENT_NAME} and {@link #KEY_ELEMENT_TYPE}) to put in the destination.
110110
* @param destination the destination where the element should be fetched to. For example, for a plug-in the <code>plugin.xml</code> file is expected
111-
* to be in <code>destination/plugin.xml</code>.
112-
* @param script the script in which to generate the segments of ant script. It is not authorized to generate target declaration during this call.
111+
* to be in <code>destination/plugin.xml</code>.
112+
* @param script the script in which to generate the segments of ant script. It is not authorized to generate target declaration during this call.
113113
*/
114114
public void generateRetrieveElementCall(Map<String, Object> entryInfos, IPath destination, IAntScript script);
115115

@@ -119,15 +119,15 @@ public interface IFetchFactory {
119119
* @param entryInfos the map that has been built in the {@link #parseMapFileEntry(String, Properties, Map)} method.
120120
* This map contains the name and the type of the element (resp. {@link #KEY_ELEMENT_NAME} and {@link #KEY_ELEMENT_TYPE}) to put in the destination.
121121
* @param destination the destination where the element should be fetched to. For example, for a plug-in the <code>plugin.xml</code> file is expected
122-
* to be in <code>destination/plugin.xml</code>.
122+
* to be in <code>destination/plugin.xml</code>.
123123
* @param files the files to obtained for the specified element.
124-
* @param script the script in which to generate the segments of ant script. It is not authorized to generate target declaration during this call.
124+
* @param script the script in which to generate the segments of ant script. It is not authorized to generate target declaration during this call.
125125
*/
126126
public void generateRetrieveFilesCall(Map<String, Object> entryInfos, IPath destination, String[] files, IAntScript script);
127127

128128
/**
129129
* This methods give opportunities to the factory to generate target declaration or other Ant top level constructs in the script.
130-
* The generated elements can be invoked from the ant scripts segments created in {@link #generateRetrieveElementCall(Map, IPath, IAntScript)}
130+
* The generated elements can be invoked from the ant scripts segments created in {@link #generateRetrieveElementCall(Map, IPath, IAntScript)}
131131
* and {@link #generateRetrieveFilesCall(Map, IPath, String[], IAntScript)}.
132132
*/
133133
public void addTargets(IAntScript script);

build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AbstractScriptGenerator.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
import org.osgi.framework.Version;
6363

6464
/**
65-
* Generic super-class for all script generator classes.
66-
* It contains basic informations like the script, the configurations, and a location
65+
* Generic super-class for all script generator classes.
66+
* It contains basic informations like the script, the configurations, and a location
6767
*/
6868
public abstract class AbstractScriptGenerator implements IXMLConstants, IPDEBuildConstants, IBuildPropertiesConstants {
6969
private static final FilenameFilter METADATA_REPO_FILTER = (dir, name) -> name.startsWith("content.") || name.startsWith("compositeContent.") || //$NON-NLS-1$ //$NON-NLS-2$
@@ -125,7 +125,7 @@ protected static void setStaticAntProperties(Properties properties) {
125125
if (getImmutableAntProperty(IBuildPropertiesConstants.PROPERTY_PACKAGER_MODE) == null) {
126126
immutableAntProperties.setProperty(IBuildPropertiesConstants.PROPERTY_PACKAGER_MODE, "false"); //$NON-NLS-1$
127127
}
128-
//When we are generating build scripts, the normalization needs to be set, and when doing packaging the default is to set normalization to true for backward compatibility
128+
//When we are generating build scripts, the normalization needs to be set, and when doing packaging the default is to set normalization to true for backward compatibility
129129
if (!getPropertyAsBoolean(IBuildPropertiesConstants.PROPERTY_PACKAGER_MODE) || getImmutableAntProperty(IBuildPropertiesConstants.PROPERTY_PACKAGER_AS_NORMALIZER) == null) {
130130
immutableAntProperties.setProperty(IBuildPropertiesConstants.PROPERTY_PACKAGER_AS_NORMALIZER, "true"); //$NON-NLS-1$
131131
}
@@ -191,7 +191,7 @@ public void setWorkingDirectory(String location) {
191191

192192
/**
193193
* Return the file system location for the given plug-in model object.
194-
*
194+
*
195195
* @param model the plug-in
196196
* @return String
197197
*/
@@ -310,8 +310,8 @@ protected static boolean loadP2Class() {
310310
}
311311

312312
/**
313-
* Return a build time site referencing things to be built.
314-
* @param refresh : indicate if a refresh must be performed. Although this flag is set to true, a new site is not rebuild if the urls of the site did not changed
313+
* Return a build time site referencing things to be built.
314+
* @param refresh : indicate if a refresh must be performed. Although this flag is set to true, a new site is not rebuild if the urls of the site did not changed
315315
* @return BuildTimeSite
316316
*/
317317
public BuildTimeSite getSite(boolean refresh) throws CoreException {
@@ -829,7 +829,7 @@ protected void generateProductReplaceTask(ProductFile product, String productFil
829829
if (product.useFeatures()) {
830830
script.println(" featureIds=\"" + mappings + "\"/>"); //$NON-NLS-1$ //$NON-NLS-2$
831831
} else {
832-
script.println(" pluginIds=\"" + mappings + "\"/>"); //$NON-NLS-1$ //$NON-NLS-2$
832+
script.println(" pluginIds=\"" + mappings + "\"/>"); //$NON-NLS-1$ //$NON-NLS-2$
833833
}
834834

835835
return;

build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AntLogAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* https://www.eclipse.org/legal/epl-2.0/
88
*
99
* SPDX-License-Identifier: EPL-2.0
10-
*
10+
*
1111
* Contributors:
1212
* IBM - Initial API and implementation
1313
*******************************************************************************/

0 commit comments

Comments
 (0)