natas_hw
/
UMLGraph
mirror of https://github.com/dspinellis/UMLGraph
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32 from DevFactory/release/remove-dead-stores-fix-1 

[squid:S1854] Dead stores should be removed
This commit is contained in:
Diomidis Spinellis 2016-06-07 17:22:20 +03:00
parent c4713960af 105db10e1a
commit ff13af7ea6
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/umlgraph/doclet/ClassGraph.java
View File

@ -264,7 +264,7 @@ class ClassGraph {
/** Print a a basic type t */
private String type(Options opt, Type t) {
String type = "";
String type;
if (opt.showQualified)
type = t.qualifiedTypeName();
else
@ -305,7 +305,7 @@ class ClassGraph {
for (FieldDoc f : fd) {
if (hidden(f))
continue;
String att = "";
String att;
stereotype(opt, f, Align.LEFT);
att = visibility(opt, f) + f.name();
if (opt.showType)
@ -506,7 +506,7 @@ class ClassGraph {
Font font = c.isAbstract() && !c.isInterface() ? Font.CLASS_ABSTRACT : Font.CLASS;
String qualifiedName = qualifiedName(opt, r);
int startTemplate = qualifiedName.indexOf('<');
int idx = 0;
int idx;
if(startTemplate < 0)
idx = qualifiedName.lastIndexOf('.');
else
@ -1022,7 +1022,7 @@ class ClassGraph {
// building relative path for context and package diagrams
if(contextDoc != null && rootClass) {
// determine the context path, relative to the root
String packageName = null;
String packageName;
if (contextDoc instanceof ClassDoc) {
packageName = ((ClassDoc) contextDoc).containingPackage().name();
} else if (contextDoc instanceof PackageDoc) {
@ -1101,7 +1101,7 @@ class ClassGraph {
* the final diagram to the associated JavaDoc page.
*/
private String mapApiDocRoot(String className) {
String root = null;
String root;
/* If no packages are specified, we use apiDocRoot for all of them. */
if (rootClasses.contains(className)) {
root = optionProvider.getGlobalOptions().apiDocRoot;
@ -1117,14 +1117,14 @@ class ClassGraph {
* @throws IOException */
public void prologue() throws IOException {
Options opt = optionProvider.getGlobalOptions();
OutputStream os = null;
OutputStream os;
if (opt.outputFileName.equals("-"))
os = System.out;
else {
// prepare output file. Use the output file name as a full path unless the output
// directory is specified
File file = null;
File file;
if (opt.outputDirectory != null)
file = new File(opt.outputDirectory, opt.outputFileName);
else

4
src/main/java/org/umlgraph/doclet/Options.java
View File

@ -557,7 +557,7 @@ public class Options implements Cloneable, OptionProvider {
try {
URL url = new URL(packageListUrl + "/package-list");
br = new BufferedReader(new InputStreamReader(url.openStream()));
String line = null;
String line;
while((line = br.readLine()) != null) {
line = line + ".";
Pattern pattern = Pattern.compile(line.replace(".", "\\.") + "[^\\.]*");
@ -587,7 +587,7 @@ public class Options implements Cloneable, OptionProvider {
try {
URL url = new URL(packageListUrl + "/package-list");
br = new BufferedReader(new InputStreamReader(url.openStream()));
String line = null;
String line;
while((line = br.readLine()) != null) {
line = line + ".";
Pattern pattern = Pattern.compile(line.replace(".", "\\.") + "[^\\.]*");

2
src/main/java/org/umlgraph/doclet/UmlGraphDoc.java
View File

@ -147,7 +147,7 @@ public class UmlGraphDoc {
dotFile.getAbsolutePath()
});
BufferedReader reader = new BufferedReader(new InputStreamReader(p.getErrorStream()));
String line = null;
String line;
while((line = reader.readLine()) != null)
root.printWarning(line);
int result = p.waitFor();