57360 – Statements and expressions are not indented properly

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 57360 - Statements and expressions are not indented properly

Summary: Statements and expressions are not indented properly

Status:	RESOLVED FIXED

Alias:	None

Product:	java
Classification:	Unclassified
Component:	Unsupported (show other bugs)
Version:	4.x
Hardware:	All All

Importance:	P3 blocker (vote)
Assignee:	Pavel Flaska

URL:
Keywords:

Depends on:
Blocks:

Reported:	2005-04-01 22:18 UTC by Martin Matula
Modified:	2007-09-26 09:14 UTC (History)
CC List:	1 user (show)

See Also:
Issue Type:	DEFECT
Exception Reporter:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description Martin Matula 2005-04-01 22:18:11 UTC

When generating code using JMI, the elements in the method body are not indented
properly (e.g. statements put into a try-catch block are at the same level as
the try-catch).

Comment 1 Pavel Flaska 2005-04-11 09:40:45 UTC

Implemented new indentation mechanism.

Checking in src/org/netbeans/modules/javacore/jmiimpl/javamodel/CatchImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/CatchImpl.java,v
 <--  CatchImpl.java
new revision: 1.7; previous revision: 1.6
done
Checking in
src/org/netbeans/modules/javacore/jmiimpl/javamodel/ComplexExpressionImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/ComplexExpressionImpl.java,v
 <--  ComplexExpressionImpl.java
new revision: 1.5; previous revision: 1.4
done
Checking in
src/org/netbeans/modules/javacore/jmiimpl/javamodel/EmptyStatementImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/EmptyStatementImpl.java,v
 <--  EmptyStatementImpl.java
new revision: 1.5; previous revision: 1.4
done
Checking in
src/org/netbeans/modules/javacore/jmiimpl/javamodel/ExpressionStatementImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/ExpressionStatementImpl.java,v
 <--  ExpressionStatementImpl.java
new revision: 1.7; previous revision: 1.6
done
Checking in
src/org/netbeans/modules/javacore/jmiimpl/javamodel/ForEachStatementImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/ForEachStatementImpl.java,v
 <--  ForEachStatementImpl.java
new revision: 1.7; previous revision: 1.6
done
Checking in
src/org/netbeans/modules/javacore/jmiimpl/javamodel/ForStatementImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/ForStatementImpl.java,v
 <--  ForStatementImpl.java
new revision: 1.6; previous revision: 1.5
done
Checking in
src/org/netbeans/modules/javacore/jmiimpl/javamodel/GotoStatementImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/GotoStatementImpl.java,v
 <--  GotoStatementImpl.java
new revision: 1.4; previous revision: 1.3
done
Checking in
src/org/netbeans/modules/javacore/jmiimpl/javamodel/IfStatementImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/IfStatementImpl.java,v
 <--  IfStatementImpl.java
new revision: 1.5; previous revision: 1.4
done
Checking in src/org/netbeans/modules/javacore/jmiimpl/javamodel/InvocationImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/InvocationImpl.java,v
 <--  InvocationImpl.java
new revision: 1.5; previous revision: 1.4
done
Checking in
src/org/netbeans/modules/javacore/jmiimpl/javamodel/LabeledStatementImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/LabeledStatementImpl.java,v
 <--  LabeledStatementImpl.java
new revision: 1.6; previous revision: 1.5
done
Checking in
src/org/netbeans/modules/javacore/jmiimpl/javamodel/LocalVarDeclarationImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/LocalVarDeclarationImpl.java,v
 <--  LocalVarDeclarationImpl.java
new revision: 1.8; previous revision: 1.7
done
Checking in
src/org/netbeans/modules/javacore/jmiimpl/javamodel/MetadataElement.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/MetadataElement.java,v
 <--  MetadataElement.java
new revision: 1.51; previous revision: 1.50
done
Checking in
src/org/netbeans/modules/javacore/jmiimpl/javamodel/MethodInvocationImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/MethodInvocationImpl.java,v
 <--  MethodInvocationImpl.java
new revision: 1.7; previous revision: 1.6
done
Checking in
src/org/netbeans/modules/javacore/jmiimpl/javamodel/MultipartIdImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/MultipartIdImpl.java,v
 <--  MultipartIdImpl.java
new revision: 1.15; previous revision: 1.14
done
Checking in
src/org/netbeans/modules/javacore/jmiimpl/javamodel/NewClassExpressionImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/NewClassExpressionImpl.java,v
 <--  NewClassExpressionImpl.java
new revision: 1.8; previous revision: 1.7
done
Checking in
src/org/netbeans/modules/javacore/jmiimpl/javamodel/ReturnStatementImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/ReturnStatementImpl.java,v
 <--  ReturnStatementImpl.java
new revision: 1.6; previous revision: 1.5
done
Checking in
src/org/netbeans/modules/javacore/jmiimpl/javamodel/StatementBlockImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/StatementBlockImpl.java,v
 <--  StatementBlockImpl.java
new revision: 1.7; previous revision: 1.6
done
Checking in
src/org/netbeans/modules/javacore/jmiimpl/javamodel/ThrowStatementImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/ThrowStatementImpl.java,v
 <--  ThrowStatementImpl.java
new revision: 1.5; previous revision: 1.4
done
Checking in
src/org/netbeans/modules/javacore/jmiimpl/javamodel/TryStatementImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/TryStatementImpl.java,v
 <--  TryStatementImpl.java
new revision: 1.8; previous revision: 1.7
done
Checking in test/build.xml;
/cvs/java/javacore/test/build.xml,v  <--  build.xml
new revision: 1.5; previous revision: 1.4
done
Checking in test/cfg-unit.xml;
/cvs/java/javacore/test/cfg-unit.xml,v  <--  cfg-unit.xml
new revision: 1.33; previous revision: 1.32
done
Checking in
test/unit/data/goldenfiles/org/netbeans/jmi/javamodel/codegen/ForEachTest1/testForCreation_ForEachTest1.pass;
/cvs/java/javacore/test/unit/data/goldenfiles/org/netbeans/jmi/javamodel/codegen/ForEachTest1/testForCreation_ForEachTest1.pass,v
 <--  testForCreation_ForEachTest1.pass
new revision: 1.3; previous revision: 1.2
done
Checking in
test/unit/data/goldenfiles/org/netbeans/jmi/javamodel/codegen/FormatterTest/FormattedClass.pass;
/cvs/java/javacore/test/unit/data/goldenfiles/org/netbeans/jmi/javamodel/codegen/FormatterTest/FormattedClass.pass,v
 <--  FormattedClass.pass
new revision: 1.5; previous revision: 1.4
done
RCS file:
/cvs/java/javacore/test/unit/data/goldenfiles/org/netbeans/jmi/javamodel/codegen/indent/Indent1Test/testIndentTryBlock_Indent1Test.pass,v
done
Checking in
test/unit/data/goldenfiles/org/netbeans/jmi/javamodel/codegen/indent/Indent1Test/testIndentTryBlock_Indent1Test.pass;
/cvs/java/javacore/test/unit/data/goldenfiles/org/netbeans/jmi/javamodel/codegen/indent/Indent1Test/testIndentTryBlock_Indent1Test.pass,v
 <--  testIndentTryBlock_Indent1Test.pass
initial revision: 1.1
done
RCS file:
/cvs/java/javacore/test/unit/data/goldenfiles/org/netbeans/jmi/javamodel/codegen/indent/Indent1Test/testThrowStatement_Indent1Test.pass,v
done
Checking in
test/unit/data/goldenfiles/org/netbeans/jmi/javamodel/codegen/indent/Indent1Test/testThrowStatement_Indent1Test.pass;
/cvs/java/javacore/test/unit/data/goldenfiles/org/netbeans/jmi/javamodel/codegen/indent/Indent1Test/testThrowStatement_Indent1Test.pass,v
 <--  testThrowStatement_Indent1Test.pass
initial revision: 1.1
done
RCS file:
/cvs/java/javacore/test/unit/data/projects/default/src/org/netbeans/test/codegen/indent/Indent1.java,v
done
Checking in
test/unit/data/projects/default/src/org/netbeans/test/codegen/indent/Indent1.java;
/cvs/java/javacore/test/unit/data/projects/default/src/org/netbeans/test/codegen/indent/Indent1.java,v
 <--  Indent1.java
initial revision: 1.1
done
RCS file:
/cvs/java/javacore/test/unit/src/org/netbeans/jmi/javamodel/codegen/indent/Indent1Test.java,v
done
Checking in
test/unit/src/org/netbeans/jmi/javamodel/codegen/indent/Indent1Test.java;
/cvs/java/javacore/test/unit/src/org/netbeans/jmi/javamodel/codegen/indent/Indent1Test.java,v
 <--  Indent1Test.java
initial revision: 1.1
done

Comment 2 Pavel Flaska 2005-04-11 09:44:17 UTC

I have just implemented some changes in indentation. Please, provide your
usecases  and problems, I will write tests for them. (And I will fix problems.)

Comment 3 Jeri Lockhart 2005-04-11 23:03:21 UTC

Hi Pavel,
The case described above was the one that initiated this IZ, and, at the moment,
I don't know of any others.  

Another formatting issue that Martin Matula and I had discussed was whether
annotations should appear on their own line.  We agreed that this probably makes
sense for class annotations.   Briefly, my opinion on the other annotation types
(method, local variable), would be to base the newline on the length of the
annotation, i.e., if the annotation is long, then put it on its own line.

If this is within the scope of this IZ, then we could discuss this further.

--Jeri

Comment 4 Pavel Flaska 2005-04-14 09:47:01 UTC

Several statements indentation fixes, refactored code - identation extracted
from model elements.

Checking in src/org/netbeans/modules/javacore/jmiimpl/javamodel/AnnotationImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/AnnotationImpl.java,v
 <--  AnnotationImpl.java
new revision: 1.14; previous revision: 1.13
done
Checking in src/org/netbeans/modules/javacore/jmiimpl/javamodel/AssignmentImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/AssignmentImpl.java,v
 <--  AssignmentImpl.java
new revision: 1.6; previous revision: 1.5
done
Checking in src/org/netbeans/modules/javacore/jmiimpl/javamodel/CaseImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/CaseImpl.java,v
 <--  CaseImpl.java
new revision: 1.6; previous revision: 1.5
done
Checking in
src/org/netbeans/modules/javacore/jmiimpl/javamodel/EmptyStatementImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/EmptyStatementImpl.java,v
 <--  EmptyStatementImpl.java
new revision: 1.6; previous revision: 1.5
done
Checking in src/org/netbeans/modules/javacore/jmiimpl/javamodel/ExpressionImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/ExpressionImpl.java,v
 <--  ExpressionImpl.java
new revision: 1.6; previous revision: 1.5
done
Checking in src/org/netbeans/modules/javacore/jmiimpl/javamodel/FeatureImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/FeatureImpl.java,v
 <--  FeatureImpl.java
new revision: 1.37; previous revision: 1.36
done
RCS file:
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/IndentUtil.java,v
done
Checking in src/org/netbeans/modules/javacore/jmiimpl/javamodel/IndentUtil.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/IndentUtil.java,v
 <--  IndentUtil.java
initial revision: 1.1
done
Checking in
src/org/netbeans/modules/javacore/jmiimpl/javamodel/LocalVarDeclarationImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/LocalVarDeclarationImpl.java,v
 <--  LocalVarDeclarationImpl.java
new revision: 1.9; previous revision: 1.8
done
Checking in
src/org/netbeans/modules/javacore/jmiimpl/javamodel/MetadataElement.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/MetadataElement.java,v
 <--  MetadataElement.java
new revision: 1.52; previous revision: 1.51
done
Checking in src/org/netbeans/modules/javacore/jmiimpl/javamodel/ResourceImpl.java;
/cvs/java/javacore/src/org/netbeans/modules/javacore/jmiimpl/javamodel/ResourceImpl.java,v
 <--  ResourceImpl.java
new revision: 1.81; previous revision: 1.80
done
Checking in test/cfg-unit.xml;
/cvs/java/javacore/test/cfg-unit.xml,v  <--  cfg-unit.xml
new revision: 1.34; previous revision: 1.33
done
RCS file:
/cvs/java/javacore/test/unit/data/goldenfiles/org/netbeans/jmi/javamodel/codegen/indent/BlenderTest/testMixStatements_BlenderTest.pass,v
done
Checking in
test/unit/data/goldenfiles/org/netbeans/jmi/javamodel/codegen/indent/BlenderTest/testMixStatements_BlenderTest.pass;
/cvs/java/javacore/test/unit/data/goldenfiles/org/netbeans/jmi/javamodel/codegen/indent/BlenderTest/testMixStatements_BlenderTest.pass,v
 <--  testMixStatements_BlenderTest.pass
initial revision: 1.1
done
RCS file:
/cvs/java/javacore/test/unit/data/goldenfiles/org/netbeans/jmi/javamodel/codegen/indent/SurroundExistingBodyTest/SurroundExistingBody_SurroundExistingBodyTest.pass,v
done
Checking in
test/unit/data/goldenfiles/org/netbeans/jmi/javamodel/codegen/indent/SurroundExistingBodyTest/SurroundExistingBody_SurroundExistingBodyTest.pass;/cvs/java/javacore/test/unit/data/goldenfiles/org/netbeans/jmi/javamodel/codegen/indent/SurroundExistingBodyTest/SurroundExistingBody_SurroundExistingBodyTest.pass,v
 <--  SurroundExistingBody_SurroundExistingBodyTest.pass
initial revision: 1.1
done
RCS file:
/cvs/java/javacore/test/unit/data/projects/default/src/org/netbeans/test/codegen/indent/Blender.java,v
done
Checking in
test/unit/data/projects/default/src/org/netbeans/test/codegen/indent/Blender.java;
/cvs/java/javacore/test/unit/data/projects/default/src/org/netbeans/test/codegen/indent/Blender.java,v
 <--  Blender.java
initial revision: 1.1
done
RCS file:
/cvs/java/javacore/test/unit/data/projects/default/src/org/netbeans/test/codegen/indent/SurroundExistingBody.java,v
done
Checking in
test/unit/data/projects/default/src/org/netbeans/test/codegen/indent/SurroundExistingBody.java;
/cvs/java/javacore/test/unit/data/projects/default/src/org/netbeans/test/codegen/indent/SurroundExistingBody.java,v
 <--  SurroundExistingBody.java
initial revision: 1.1
done
RCS file:
/cvs/java/javacore/test/unit/src/org/netbeans/jmi/javamodel/codegen/indent/BlenderTest.java,v
done
Checking in
test/unit/src/org/netbeans/jmi/javamodel/codegen/indent/BlenderTest.java;
/cvs/java/javacore/test/unit/src/org/netbeans/jmi/javamodel/codegen/indent/BlenderTest.java,v
 <--  BlenderTest.java
initial revision: 1.1
done
Checking in
test/unit/src/org/netbeans/jmi/javamodel/codegen/indent/Indent1Test.java;
/cvs/java/javacore/test/unit/src/org/netbeans/jmi/javamodel/codegen/indent/Indent1Test.java,v
 <--  Indent1Test.java
new revision: 1.2; previous revision: 1.1
done
RCS file:
/cvs/java/javacore/test/unit/src/org/netbeans/jmi/javamodel/codegen/indent/SurroundExistingBodyTest.java,v
done
Checking in
test/unit/src/org/netbeans/jmi/javamodel/codegen/indent/SurroundExistingBodyTest.java;
/cvs/java/javacore/test/unit/src/org/netbeans/jmi/javamodel/codegen/indent/SurroundExistingBodyTest.java,v
 <--  SurroundExistingBodyTest.java
initial revision: 1.1
done

Comment 5 Pavel Flaska 2005-05-04 14:05:24 UTC

Most of problems were fixed. -- Closing this issue, all other problems should
have their own bug with specific description.

Comment 6 Quality Engineering 2007-09-20 11:56:15 UTC

Reorganization of java component