MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Roman Shevchenko
2015-10-16 14:01:50 +02:00
parent ad913f5121 51fe0b0dec
commit 4e0c7eeeba
261 changed files with 8851 additions and 1789 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/scripts/utils.gant
+12 -5
View File
@@ -14,15 +14,12 @@
* limitations under the License.
*/
import com.intellij.openapi.util.SystemInfo
import com.intellij.openapi.util.io.FileUtil
import org.jetbrains.jps.gant.JpsGantTool
import org.jetbrains.jps.gant.TeamCityBuildInfoPrinter
import org.jetbrains.jps.model.java.JavaResourceRootType
import org.jetbrains.jps.model.java.JavaSourceRootType
import org.jetbrains.jps.model.java.JdkVersionDetector
import org.jetbrains.jps.model.java.JpsJavaExtensionService
import org.jetbrains.jps.model.java.JpsJavaSdkType
import org.jetbrains.jps.model.java.*
import org.jetbrains.jps.model.library.JpsOrderRootType
import org.jetbrains.jps.model.module.JpsModule
import org.jetbrains.jps.model.serialization.JpsModelSerializationDataService
@@ -759,6 +756,16 @@ binding.setVariable("zipSourcesOfModules", { String targetFilePath, Collection<S
notifyArtifactBuilt(targetFilePath)
})
binding.setVariable("moduleSrc", {String moduleName ->
result = []
JpsModule module = findModule(moduleName)
if (module == null) projectBuilder.error("Module $moduleName not found")
module.getSourceRoots(JavaSourceRootType.SOURCE).each { root ->
result << ant.zipfileset(dir: root.file.absolutePath , prefix: root.properties.packagePrefix.replace('.', '/'), erroronmissingdir: false)
}
result
})
/**
* E.g.
*
java/debugger/impl/src/com/intellij/debugger/engine/BasicStepMethodFilter.java
+33 -5
View File
@@ -17,7 +17,10 @@ package com.intellij.debugger.engine;
import com.intellij.debugger.engine.evaluation.EvaluateException;
import com.intellij.debugger.impl.DebuggerUtilsEx;
import com.intellij.psi.PsiMethod;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.Computable;
import com.intellij.psi.*;
import com.intellij.util.Range;
import com.sun.jdi.Location;
import com.sun.jdi.Method;
@@ -29,6 +32,8 @@ import org.jetbrains.annotations.Nullable;
* Date: 10/26/13
*/
public class BasicStepMethodFilter implements NamedMethodFilter {
private static final Logger LOG = Logger.getInstance(BasicStepMethodFilter.class);
@NotNull
protected final JVMName myDeclaringClassName;
@NotNull
@@ -59,17 +64,40 @@ public class BasicStepMethodFilter implements NamedMethodFilter {
return myTargetMethodName;
}
public boolean locationMatches(DebugProcessImpl process, Location location) throws EvaluateException {
public boolean locationMatches(final DebugProcessImpl process, final Location location) throws EvaluateException {
final Method method = location.method();
if (!myTargetMethodName.equals(method.name())) {
return false;
boolean lambdaMatched = false;
String name = method.name();
if (!myTargetMethodName.equals(name)) {
if (LambdaMethodFilter.isLambdaName(name)) {
lambdaMatched = ApplicationManager.getApplication().runReadAction(new Computable<Boolean>() {
@Override
public Boolean compute() {
PsiParameterListOwner psiMethod = DebuggerUtilsEx.getContainingMethod(process.getPositionManager().getSourcePosition(location));
if (psiMethod instanceof PsiLambdaExpression) {
PsiType type = ((PsiLambdaExpression)psiMethod).getFunctionalInterfaceType();
PsiMethod interfaceMethod = LambdaUtil.getFunctionalInterfaceMethod(type);
if (type != null && interfaceMethod != null && myTargetMethodName.equals(interfaceMethod.getName())) {
try {
return type.getCanonicalText().equals(myDeclaringClassName.getName(process).replace('$', '.'));
}
catch (EvaluateException e) {
LOG.info(e);
}
}
}
return false;
}
});
}
if (!lambdaMatched) return false;
}
if (myTargetMethodSignature != null) {
if (!signatureMatches(method, myTargetMethodSignature.getName(process))) {
return false;
}
}
return DebuggerUtilsEx.isAssignableFrom(myDeclaringClassName.getName(process), location.declaringType());
return lambdaMatched || DebuggerUtilsEx.isAssignableFrom(myDeclaringClassName.getName(process), location.declaringType());
}
private static boolean signatureMatches(Method method, final String expectedSignature) throws EvaluateException {
java/debugger/impl/src/com/intellij/debugger/engine/JavaValue.java
+1 -1
View File
@@ -294,7 +294,7 @@ public class JavaValue extends XNamedValue implements NodeDescriptorProvider, XV
String value = myValue;
if (myValueDescriptor.isString()) {
renderer.renderStringValue(myValue, "\"\\", XValueNode.MAX_VALUE_LENGTH);
renderer.renderStringValue(myValue, "\"", XValueNode.MAX_VALUE_LENGTH);
return;
}
else if (myValueDescriptor.getLastRenderer() instanceof ToStringRenderer ||
java/debugger/impl/src/com/intellij/debugger/engine/SuspendManagerImpl.java
+3 -3
View File
@@ -15,7 +15,7 @@
*/
package com.intellij.debugger.engine;
import com.intellij.debugger.engine.events.SuspendContextCommandImpl;
import com.intellij.debugger.engine.events.DebuggerCommandImpl;
import com.intellij.debugger.jdi.ThreadReferenceProxyImpl;
import com.intellij.openapi.diagnostic.Logger;
import com.sun.jdi.InternalException;
@@ -309,9 +309,9 @@ public class SuspendManagerImpl implements SuspendManager {
if(suspendContext.myVotesToVote == 0) {
if(suspendContext.myIsVotedForResume) {
// resume in a separate request to allow other requests be processed (e.g. dependent bpts enable)
myDebugProcess.getManagerThread().schedule(new SuspendContextCommandImpl(suspendContext) {
myDebugProcess.getManagerThread().schedule(new DebuggerCommandImpl() {
@Override
public void contextAction() throws Exception {
protected void action() throws Exception {
resume(suspendContext);
}
java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsEx.java
+2 -1
View File
@@ -872,7 +872,8 @@ public abstract class DebuggerUtilsEx extends DebuggerUtils {
}
@Nullable
public static PsiParameterListOwner getContainingMethod(@NotNull SourcePosition position) {
public static PsiParameterListOwner getContainingMethod(@Nullable SourcePosition position) {
if (position == null) return null;
return getContainingMethod(position.getElementAt());
}
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightNamesUtil.java
+3 -3
View File
@@ -191,9 +191,9 @@ public class HighlightNamesUtil {
return HighlightInfoType.LOCAL_VARIABLE;
}
if (var instanceof PsiField) {
return var.hasModifierProperty(PsiModifier.STATIC) ? var.hasModifierProperty(PsiModifier.FINAL)
? HighlightInfoType.STATIC_FINAL_FIELD
: HighlightInfoType.STATIC_FIELD : HighlightInfoType.INSTANCE_FIELD;
return var.hasModifierProperty(PsiModifier.STATIC)
? var.hasModifierProperty(PsiModifier.FINAL) ? HighlightInfoType.STATIC_FINAL_FIELD : HighlightInfoType.STATIC_FIELD
: var.hasModifierProperty(PsiModifier.FINAL) ? HighlightInfoType.INSTANCE_FINAL_FIELD : HighlightInfoType.INSTANCE_FIELD;
}
if (var instanceof PsiParameter) {
return HighlightInfoType.PARAMETER;
java/java-impl/src/com/intellij/codeInsight/daemon/impl/MarkerType.java
+16 -13
View File
@@ -57,8 +57,7 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.event.MouseEvent;
import java.text.MessageFormat;
import java.util.Arrays;
import java.util.Comparator;
import java.util.*;
public class MarkerType {
@@ -285,11 +284,12 @@ public class MarkerType {
new PsiElementProcessor.CollectElementsWithLimit<PsiMethod>(2, new THashSet<PsiMethod>());
final PsiElementProcessor.CollectElementsWithLimit<PsiFunctionalExpression> collectExprProcessor =
new PsiElementProcessor.CollectElementsWithLimit<PsiFunctionalExpression>(2, new THashSet<PsiFunctionalExpression>());
final boolean isAbstract = method.hasModifierProperty(PsiModifier.ABSTRACT);
if (!ProgressManager.getInstance().runProcessWithProgressSynchronously(new Runnable() {
@Override
public void run() {
OverridingMethodsSearch.search(method, true).forEach(new PsiElementProcessorAdapter<PsiMethod>(collectProcessor));
if (collectProcessor.getCollection().isEmpty()) {
if (isAbstract && collectProcessor.getCollection().size() < 2) {
final PsiClass aClass = ApplicationManager.getApplication().runReadAction(new Computable<PsiClass>() {
@Override
public PsiClass compute() {
@@ -306,13 +306,15 @@ public class MarkerType {
}
final PsiMethod[] methodOverriders = collectProcessor.toArray(PsiMethod.EMPTY_ARRAY);
NavigatablePsiElement[] overridings = ArrayUtil.mergeArrays(methodOverriders, collectExprProcessor.toArray(PsiFunctionalExpression.EMPTY_ARRAY));
if (overridings.length == 0) return;
final List<NavigatablePsiElement> overridings = new ArrayList<NavigatablePsiElement>();
overridings.addAll(collectProcessor.getCollection());
overridings.addAll(collectExprProcessor.getCollection());
if (overridings.isEmpty()) return;
boolean showMethodNames = !PsiUtil.allMethodsHaveSameSignature(methodOverriders);
MethodOrFunctionalExpressionCellRenderer renderer = new MethodOrFunctionalExpressionCellRenderer(showMethodNames);
Arrays.sort(overridings, renderer.getComparator());
Collections.sort(overridings, renderer.getComparator());
final OverridingMethodsUpdater methodsUpdater = new OverridingMethodsUpdater(method, renderer);
PsiElementListNavigator.openTargets(e, overridings, methodsUpdater.getCaption(overridings.length), "Overriding methods of " + method.getName(), renderer, methodsUpdater);
PsiElementListNavigator.openTargets(e, overridings.toArray(new NavigatablePsiElement[overridings.size()]), methodsUpdater.getCaption(overridings.size()), "Overriding methods of " + method.getName(), renderer, methodsUpdater);
}
private static final String SEARCHING_FOR_OVERRIDDEN_METHODS = "Searching for Overridden Methods";
@@ -380,7 +382,7 @@ public class MarkerType {
@Override
public void run() {
ClassInheritorsSearch.search(aClass, true).forEach(new PsiElementProcessorAdapter<PsiClass>(collectProcessor));
if (collectProcessor.getCollection().isEmpty()) {
if (collectProcessor.getCollection().size() < 2) {
FunctionalExpressionSearch.search(aClass).forEach(new PsiElementProcessorAdapter<PsiFunctionalExpression>(collectExprProcessor));
}
}
@@ -388,13 +390,14 @@ public class MarkerType {
return;
}
NavigatablePsiElement[] inheritors = ArrayUtil.mergeArrays(collectProcessor.toArray(PsiClass.EMPTY_ARRAY),
collectExprProcessor.toArray(PsiFunctionalExpression.EMPTY_ARRAY));
if (inheritors.length == 0) return;
final List<NavigatablePsiElement> inheritors = new ArrayList<NavigatablePsiElement>();
inheritors.addAll(collectProcessor.getCollection());
inheritors.addAll(collectExprProcessor.getCollection());
if (inheritors.isEmpty()) return;
final PsiClassOrFunctionalExpressionListCellRenderer renderer = new PsiClassOrFunctionalExpressionListCellRenderer();
final SubclassUpdater subclassUpdater = new SubclassUpdater(aClass, renderer);
Arrays.sort(inheritors, renderer.getComparator());
PsiElementListNavigator.openTargets(e, inheritors, subclassUpdater.getCaption(inheritors.length), CodeInsightBundle.message("goto.implementation.findUsages.title", aClass.getName()), renderer, subclassUpdater);
Collections.sort(inheritors, renderer.getComparator());
PsiElementListNavigator.openTargets(e, inheritors.toArray(new NavigatablePsiElement[inheritors.size()]), subclassUpdater.getCaption(inheritors.size()), CodeInsightBundle.message("goto.implementation.findUsages.title", aClass.getName()), renderer, subclassUpdater);
}
private static class SubclassUpdater extends ListBackgroundUpdaterTask {
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/JetBrainsAnnotationsExternalLibraryResolver.java
+4 -4
View File
@@ -37,7 +37,7 @@ import java.util.List;
* @author nik
*/
public class JetBrainsAnnotationsExternalLibraryResolver extends ExternalLibraryResolver {
private static final ExternalLibraryDescriptor JAVA5 = new JetBrainsAnnotationsLibraryDescriptor() {
private static final ExternalLibraryDescriptor JAVA5 = new JetBrainsAnnotationsLibraryDescriptor("annotations-java5") {
@NotNull
@Override
public List<String> getLibraryClassesRoots() {
@@ -49,7 +49,7 @@ public class JetBrainsAnnotationsExternalLibraryResolver extends ExternalLibrary
}
};
private static final ExternalLibraryDescriptor JAVA8 = new JetBrainsAnnotationsLibraryDescriptor() {
private static final ExternalLibraryDescriptor JAVA8 = new JetBrainsAnnotationsLibraryDescriptor("annotations") {
@NotNull
@Override
public List<String> getLibraryClassesRoots() {
@@ -86,8 +86,8 @@ public class JetBrainsAnnotationsExternalLibraryResolver extends ExternalLibrary
}
private static abstract class JetBrainsAnnotationsLibraryDescriptor extends ExternalLibraryDescriptor {
public JetBrainsAnnotationsLibraryDescriptor() {
super("com.intellij", "annotations");
public JetBrainsAnnotationsLibraryDescriptor(final String artifactId) {
super("org.jetbrains", artifactId);
}
}
}
java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
+15 -1
View File
@@ -41,6 +41,7 @@ import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.psi.impl.JavaConstantExpressionEvaluator;
import com.intellij.psi.impl.source.tree.JavaDocElementType;
import com.intellij.psi.impl.source.tree.JavaElementType;
import com.intellij.psi.javadoc.*;
import com.intellij.psi.search.EverythingGlobalScope;
import com.intellij.psi.util.PsiFormatUtil;
@@ -732,7 +733,7 @@ public class JavaDocInfoGenerator {
if (packageInfoFile != null) {
final ASTNode node = packageInfoFile.getNode();
if (node != null) {
final ASTNode docCommentNode = node.findChildByType(JavaDocElementType.DOC_COMMENT);
final ASTNode docCommentNode = findRelevantCommentNode(node);
if (docCommentNode != null) {
final PsiDocComment docComment = (PsiDocComment)docCommentNode.getPsi();
@@ -755,6 +756,19 @@ public class JavaDocInfoGenerator {
}
}
/**
* Finds doc comment immediately preceding package statement
*/
@Nullable
private static ASTNode findRelevantCommentNode(@NotNull ASTNode fileNode) {
ASTNode node = fileNode.findChildByType(JavaElementType.PACKAGE_STATEMENT);
if (node == null) node = fileNode.getLastChildNode();
while (node != null && node.getElementType() != JavaDocElementType.DOC_COMMENT) {
node = node.getTreePrev();
}
return node;
}
public void generateCommonSection(StringBuilder buffer, PsiDocComment docComment) {
generateDescription(buffer, docComment);
generateApiSection(buffer, docComment);
java/java-impl/src/com/intellij/openapi/options/colors/pages/JavaColorSettingsPage.java
+3
View File
@@ -71,6 +71,7 @@ public class JavaColorSettingsPage implements ColorSettingsPage, InspectionColor
new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.reassigned.parameter"), CodeInsightColors.REASSIGNED_PARAMETER_ATTRIBUTES),
new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.implicit.anonymous.parameter"), CodeInsightColors.IMPLICIT_ANONYMOUS_CLASS_PARAMETER_ATTRIBUTES),
new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.instance.field"), CodeInsightColors.INSTANCE_FIELD_ATTRIBUTES),
new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.instance.final.field"), CodeInsightColors.INSTANCE_FINAL_FIELD_ATTRIBUTES),
new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.static.field"), CodeInsightColors.STATIC_FIELD_ATTRIBUTES),
new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.static.final.field"), CodeInsightColors.STATIC_FINAL_FIELD_ATTRIBUTES),
new AttributesDescriptor(OptionsBundle.message("options.java.attribute.descriptor.parameter"), CodeInsightColors.PARAMETER_ATTRIBUTES),
@@ -120,6 +121,7 @@ public class JavaColorSettingsPage implements ColorSettingsPage, InspectionColor
ourTags.put("annotationName", CodeInsightColors.ANNOTATION_NAME_ATTRIBUTES);
ourTags.put("annotationAttributeName", CodeInsightColors.ANNOTATION_ATTRIBUTE_NAME_ATTRIBUTES);
ourTags.put("javadocTagValue", JavaHighlightingColors.DOC_COMMENT_TAG_VALUE);
ourTags.put("instanceFinalField", CodeInsightColors.INSTANCE_FINAL_FIELD_ATTRIBUTES);
}
@Override
@@ -168,6 +170,7 @@ public class JavaColorSettingsPage implements ColorSettingsPage, InspectionColor
" private double <unusedField>unusedField</unusedField> = 12345.67890;\n" +
" private <unknownType>UnknownType</unknownType> <field>anotherString</field> = \"Another\\nStrin\\g\";\n" +
" public static int <static>staticField</static> = 0;\n" +
" public final int <instanceFinalField>instanceFinalField</instanceFinalField> = 0;\n" +
"\n" +
" public <constructorDeclaration>SomeClass</constructorDeclaration>(<interface>AnInterface</interface> <param>param</param>, int[] <reassignedParameter>reassignedParam</reassignedParameter>) {\n" +
" <error>int <localVar>localVar</localVar> = \"IntelliJ\"</error>; // Error, incompatible types\n" +
java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringDialog.java
+7 -2
View File
@@ -28,7 +28,9 @@ import com.intellij.refactoring.RefactoringBundle;
import com.intellij.refactoring.inline.InlineOptionsDialog;
import com.intellij.refactoring.ui.DocCommentPanel;
import com.intellij.ui.IdeBorderFactory;
import com.intellij.ui.ScrollPaneFactory;
import com.intellij.util.Function;
import com.intellij.util.ui.JBDimension;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -83,13 +85,16 @@ public class InlineSuperClassRefactoringDialog extends InlineOptionsDialog {
}
}, "\',<br>&nbsp;&nbsp;&nbsp;\'") +
"\'</html>");
label.setBorder(IdeBorderFactory.createEmptyBorder(5, 5, 5, 5));
final JPanel panel = new JPanel(new GridBagLayout());
final GridBagConstraints gc =
new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL,
new Insets(0, 0, 0, 0), 0, 0);
panel.add(myDocPanel, gc);
panel.add(label, gc);
JScrollPane pane = ScrollPaneFactory.createScrollPane(label);
pane.setBorder(IdeBorderFactory.createEmptyBorder(5, 5, 5, 5));
pane.setMinimumSize(JBDimension.create(new Dimension(-1, 100)));
pane.setMaximumSize(JBDimension.create(new Dimension(-1, 400)));
panel.add(pane, gc);
gc.weighty = 1;
gc.fill = GridBagConstraints.BOTH;
panel.add(super.createCenterPanel(), gc);
java/java-psi-impl/src/com/intellij/codeInsight/ExceptionUtil.java
+2 -2
View File
@@ -268,10 +268,10 @@ public class ExceptionUtil {
else if (element instanceof PsiMethodReferenceExpression) {
PsiExpression qualifierExpression = ((PsiMethodReferenceExpression)element).getQualifierExpression();
return qualifierExpression != null ? collectUnhandledExceptions(qualifierExpression, topElement, null, false)
: Collections.<PsiClassType>emptySet();
: null;
}
else if (element instanceof PsiLambdaExpression) {
return Collections.emptySet();
return null;
}
else if (element instanceof PsiThrowStatement) {
PsiThrowStatement statement = (PsiThrowStatement)element;
java/java-psi-impl/src/com/intellij/psi/impl/TypeCorrector.java
+6 -1
View File
@@ -118,7 +118,12 @@ class TypeCorrector extends PsiTypeMapper {
private PsiSubstitutor mapSubstitutor(PsiClass originalClass, PsiClass mappedClass, PsiSubstitutor substitutor) {
PsiTypeParameter[] typeParameters = mappedClass.getTypeParameters();
PsiTypeParameter[] originalTypeParameters = originalClass.getTypeParameters();
if (typeParameters.length != originalTypeParameters.length) return substitutor;
if (typeParameters.length != originalTypeParameters.length) {
if (originalTypeParameters.length == 0) {
return JavaPsiFacade.getElementFactory(mappedClass.getProject()).createRawSubstitutor(mappedClass);
}
return substitutor;
}
Map<PsiTypeParameter, PsiType> substitutionMap = substitutor.getSubstitutionMap();
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/ExceptionCollectionWithLambda.java
+24
View File
@@ -0,0 +1,24 @@
import java.io.File;
import java.io.IOException;
interface I {
void m(String s) throws IOException;
}
class Test {
public void test() throws IOException {
File file = new File("temp");
try {
for(int t = 0; t < 4; ++t) {
for (int i = 0; i < 10; ++i) {
I appender = out -> File.createTempFile("", "").exists();
appender.m("");
}
}
}
finally {
System.out.println(file);
}
}
}
java/java-tests/testData/codeInsight/javadocIG/packageInfoWithCopyright/package-info.java
+8
View File
@@ -0,0 +1,8 @@
/**
* Copyright
*/
/**
* This package contains nothing but package-info.java
*/
package packageInfoWithCopyright;
java/java-tests/testData/codeInsight/javadocIG/packageInfoWithCopyright/packageInfo.html
+2
View File
@@ -0,0 +1,2 @@
<html><head> <style type="text/css"> #error { background-color: #eeeeee; margin-bottom: 10px; } p { margin: 5px 0; } </style></head><body>
This package contains nothing but package-info.java</body></html>
java/java-tests/testData/codeInsight/multipleJdks/java3/p/RawAssignmentToGenerics.java
+9
View File
@@ -0,0 +1,9 @@
package p;
import java.util.Map;
public class Bar {
public static Map get() {
return null;
}
}
java/java-tests/testData/codeInsight/multipleJdks/java7/p/RawAssignmentToGenerics.java
+7
View File
@@ -0,0 +1,7 @@
package p;
import java.util.Map;
class Foo {
{
Map<String, String> m = Bar.get();
}
}
java/java-tests/testData/dependencies/search/forwardJdkClasses/A.java
+3
View File
@@ -0,0 +1,3 @@
public class A{
String myName;
}
java/java-tests/testData/psi/formatter/indent/BinaryOperation.java
+7
View File
@@ -0,0 +1,7 @@
public class Foo {
public void foo() {
abc = x +
2;
}
}
java/java-tests/testData/psi/formatter/indent/BinaryOperationSignMoved.java
+7
View File
@@ -0,0 +1,7 @@
public class Foo {
public void foo() {
abc = x
+ 2;
}
}
java/java-tests/testData/psi/formatter/indent/BinaryOperationSignMoved_after.java
+7
View File
@@ -0,0 +1,7 @@
public class Foo {
public void foo() {
abc = x
+ 2;
}
}
java/java-tests/testData/psi/formatter/indent/BinaryOperation_after.java
+6
View File
@@ -0,0 +1,6 @@
public class Foo {
public void foo() {
abc = x +
2;
}
}
java/java-tests/testData/psi/formatter/indent/DoNotIndentTopLevelClassMembers.java
+12
View File
@@ -0,0 +1,12 @@
public class Foo {
public void foo() {
x += 2;
}
public static class Inner {
public void bar() {
y += 2;
}
}
}
java/java-tests/testData/psi/formatter/indent/DoNotIndentTopLevelClassMembers_after.java
+12
View File
@@ -0,0 +1,12 @@
public class Foo {
public void foo() {
x += 2;
}
public static class Inner {
public void bar() {
y += 2;
}
}
}
java/java-tests/testData/psi/formatter/indent/ImplementsList.java
+6
View File
@@ -0,0 +1,6 @@
public class Foo implements
Seralizable,
Throwable,
Cloneable {
}
java/java-tests/testData/psi/formatter/indent/ImplementsList2.java
+5
View File
@@ -0,0 +1,5 @@
public class Foo implements Seralizable,
Throwable,
Cloneable {
}
java/java-tests/testData/psi/formatter/indent/ImplementsList2_after.java
+5
View File
@@ -0,0 +1,5 @@
public class Foo implements Seralizable,
Throwable,
Cloneable {
}
java/java-tests/testData/psi/formatter/indent/ImplementsList_after.java
+6
View File
@@ -0,0 +1,6 @@
public class Foo implements
Seralizable,
Throwable,
Cloneable {
}
java/java-tests/testData/psi/formatter/indent/ParenthesizedBinop.java
+8
View File
@@ -0,0 +1,8 @@
public class foo {
{
abc = (a +
b
);
}
}
java/java-tests/testData/psi/formatter/indent/ParenthesizedBinop_after.java
+8
View File
@@ -0,0 +1,8 @@
public class foo {
{
abc = (a +
b
);
}
}
java/java-tests/testData/psi/formatter/indent/ParenthesizedContinuation.java
+8
View File
@@ -0,0 +1,8 @@
public class foo {
{
abc = (
a + b
);
}
}
java/java-tests/testData/psi/formatter/indent/ParenthesizedContinuation2.java
+7
View File
@@ -0,0 +1,7 @@
public class foo {
{
abc = (
a + b);
}
}
java/java-tests/testData/psi/formatter/indent/ParenthesizedContinuation2_after.java
+7
View File
@@ -0,0 +1,7 @@
public class foo {
{
abc = (
a + b);
}
}
java/java-tests/testData/psi/formatter/indent/ParenthesizedContinuation_after.java
+8
View File
@@ -0,0 +1,8 @@
public class foo {
{
abc = (
a + b
);
}
}
java/java-tests/testData/psi/formatter/indent/SCR3681.java
+3
View File
@@ -0,0 +1,3 @@
class Foo { // comment here
int a;
}
java/java-tests/testData/psi/formatter/indent/SCR3681_after.java
+4
View File
@@ -0,0 +1,4 @@
class Foo { // comment here
int a;
}
java/java-tests/testData/psi/formatter/indent/TernaryOperation.java
+8
View File
@@ -0,0 +1,8 @@
public class Foo {
public void foo() {
abcd = x ?
2 :
3;
}
}
java/java-tests/testData/psi/formatter/indent/TernaryOperationSignMoved.java
+8
View File
@@ -0,0 +1,8 @@
public class Foo {
public void foo() {
abc = x
? 2
: 3;
}
}
java/java-tests/testData/psi/formatter/indent/TernaryOperationSignMoved_after.java
+8
View File
@@ -0,0 +1,8 @@
public class Foo {
public void foo() {
abc = x
? 2
: 3;
}
}
java/java-tests/testData/psi/formatter/indent/TernaryOperation_after.java
+8
View File
@@ -0,0 +1,8 @@
public class Foo {
public void foo() {
abcd = x ?
2 :
3;
}
}
java/java-tests/testData/psi/formatter/java/paymentManager.java
+409
View File
@@ -0,0 +1,409 @@
package cms.si.payment;
import cms.AmountMoreThanBalanceException;
import cms.db.*;
import cms.db.payments.px.PayConRequest;
import cms.db.payments.px.PayConResponse;
import cms.db.payments.px.PayConStatus;
import cms.hibernate.HibernateSessionFactory;
import cms.si.payment.px.PayConPaymentSystem;
import cms.si.payment.px.PaymentException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.Query;
import org.hibernate.Session;
import javax.servlet.http.HttpServletRequest;
import java.util.*;
/**
* @author alf
* @author Alexey Malkovskiy
*/
public class PaymentManager {
private static final Log log = LogFactory.getLog(PaymentManager.class);
public static final int TRANSACTION_PENDING = 1;
public static final int TRANSACTION_PROCESSED = 2;
public static final int TRANSACTION_DECLINED = 3;
public BillingInfo billCreditCard(Player player, Long transactionID, CreditCard card,
double amount, String ipAddress, String customerRef) throws WrongAmountException, PaymentException {
player.setUpdateDate(new Date());
PayConPaymentSystem px = PayConPaymentSystem.getInstance();
String strTransactionID = px.getTrackID(transactionID);
// here comes authorization code
PayConRequest request = px.createAuthRequest(player.getCurrency().getId(),
strTransactionID, card, amount, ipAddress, player.getUsername());
PayConResponse response = px.sendRequest(request);
if (response.getReturnCode() != ReturnCode.RETURN_CODE_SUCCESS ||
response.getStatus().getAuthCode() != AuthorizationFailureObject.SUCCESS)
throw new PaymentException();
double paid = response.getStatus().getAmountPaid();
if (amount != paid)
throw new WrongAmountException(amount, paid);
player.incrementBalance(paid);
log.info("billCreditCard player " + player.getId() + " TrackID " + strTransactionID
+ " added " + amount
+ " to balance because the credit card was charged for this amount");
return new BillingInfo(response.getStatus().getAmountPaid(),
response.getStatus().getAmountReq(),
response.getStatus().getTransactionId());
}
public void performDeposit(double amount, Player player, CreditCardInfo info,
HttpServletRequest request, String remoteHost) throws PaymentException, WrongAmountException {
org.hibernate.Transaction tx = HibernateSessionFactory.currentSession().beginTransaction();
Transaction t = new Transaction();
t.setAmount(amount);
t.setType(TransactionType.DEPOSIT);
t.setStatus(TransactionStatus.PENDING);
t.setCreateDate(new Date());
t.setPlayer(player);
saveNow(t);
try {
BillingInfo billingInfo = billCreditCard(player, t.getId(), info, amount, remoteHost,
player.getUsername());
t.setStatus(TransactionStatus.COMPLETED);
t.setExternalId(billingInfo.getTransactionId());
t.setProcessDate(new Date());
} catch (PaymentException e) {
log.error("Payment problem", e);
// TODO
} catch (
WrongAmountException e
) {
log.error("Wrong amount", e);
// TODO
}
tx.commit
();
}
private void saveNow(Transaction t) {
Session
session
=
HibernateSessionFactory
.currentSession();
session
.
save
(
t
);
session.
flush()
;
}
@SuppressWarnings
(
"unchecked"
)
public
UserCashOut
performCashOut(
double
amount
,
Player
player
)
throws
AmountMoreThanBalanceException {
Session
ses
=
HibernateSessionFactory
.
currentSession
()
;
if (player.getBalanceAmt() < amount) {
throw new AmountMoreThanBalanceException();
}
org
.
hibernate
.
Transaction
tx
=
ses
.
beginTransaction
(
)
;
UserCashOut
userCashOut
=
new
UserCashOut
(
);
userCashOut.setAmount(amount);
userCashOut.setCreateDate(new Date());
userCashOut.setPlayer(player);
player.getCashOuts().add(userCashOut);
ses.save(userCashOut);
double checkAmount = 0;
double amountForPay = amount;
boolean freeDebitsExist = true;
//
while (amountForPay > 0 && freeDebitsExist) {
List<CashOutDebitInfo> freeDebits = findFreeDebits(player, ses);
if (freeDebits.isEmpty()) {
freeDebitsExist = false;
checkAmount += amountForPay;
} else {
double oldAmount = amountForPay;
amountForPay = createCredits(amountForPay, player, freeDebits, userCashOut, ses);
amountForPay += payCredits(freeDebits, userCashOut, ses);
if (amountForPay == oldAmount) {
//This is strange and hypothetical situation. It can mean
//that PaymentConnexions doesn't work properly. Pay by check.
freeDebitsExist = false;
checkAmount += amountForPay;
}
}
ses.flush();
}
//
if (checkAmount > 0) {
payCheck(player, ses, userCashOut, checkAmount);
}
player.setBalanceAmt(player.getBalanceAmt() - amount);
tx.commit();
return userCashOut;
}
private void payCheck(Player player, Session ses, UserCashOut userCashOut, double checkAmount) {
Check check = new Check();
check.setAmount(checkAmount);
check.setCreateDate(new Date());
check.setPlayer(player);
player.getChecks().add(check);
check.setUserCashOut(userCashOut);
userCashOut.setCheck(check);
Transaction transaction = new Transaction();
transaction.setAmount(-checkAmount);
transaction.setCreateDate(new Date());
transaction.setProcessDate(new Date());
transaction.setType(TransactionType.CASHOUT);
transaction.setStatus(TransactionStatus.PENDING);
transaction.setPlayer(player);
check.setTransaction(transaction);
transaction.setCheck(check);
ses.save(transaction);
ses.save(check);
}
private double payCredits(List<CashOutDebitInfo> freeDebits, UserCashOut userCashOut,
Session ses) {
double unpaidAmount = 0;
for (CashOutDebitInfo info : freeDebits) {
try {
String trackId = "Tr" + info.credit.getId();
PayConRequest creditRequest = PayConPaymentSystem.getInstance().createReversalRequest(
userCashOut.getPlayer().getCurrency().getId(),
trackId, -info.credit.getAmount(),
new Long(info.debit.getExternalId()));
PayConResponse response = PayConPaymentSystem.getInstance().sendRequest(creditRequest);
final PayConStatus status = response.getStatus();
if (response.getReturnCode() == ReturnCode.RETURN_CODE_SUCCESS &&
status.getAuthCode() == AuthorizationFailureObject.SUCCESS) {
info.credit.setAmount(-status.getAmountPaid());
info.credit.setExternalId(status.getTransactionId());
info.credit.setStatus(TransactionStatus.COMPLETED);
info.credit.setProcessDate(new Date());
} else {
switch (status.getAuthCode()) {
case TRANSACTION_PENDING:
info.credit.setStatus(TransactionStatus.PENDING);
break;
case TRANSACTION_PROCESSED:
//This is hypothetical situation. We have to delete this credit
//transaction. Original debit transaction still free for
//future credits.
ses.delete(info.credit);
info.credit = null;
break;
case TRANSACTION_DECLINED:
default:
info.debit.getCreditTransactions().remove(info.credit);
info.credit.setOriginalDebitTransaction(null);
info.debit.setCreditStatus("ERROR - " + status.getAuthCode());
userCashOut.getCredits().remove(info.credit);
info.credit.setUserCashOut(null);
unpaidAmount += -info.credit.getAmount();
ses.delete(info.credit);
break;
}
}
} catch (PaymentException e) {
// ignore
//log.error(e.getMessage(), e);
}
}
return unpaidAmount;
}
private double createCredits(double amount, Player player, List<CashOutDebitInfo> freeDebits, UserCashOut userCashOut, Session ses) {
double checkAmount = amount;
int i = 0;
for (CashOutDebitInfo debitInfo : freeDebits) {
Transaction credit = new Transaction();
if (checkAmount > debitInfo.remainder) {
credit.setAmount(-debitInfo.remainder);
checkAmount -= debitInfo.remainder;
} else {
credit.setAmount(-checkAmount);
checkAmount = 0;
}
credit.setCreateDate(new Date());
credit.setOriginalDebitTransaction(debitInfo.debit);
debitInfo.debit.getCreditTransactions().add(credit);
credit.setPlayer(player);
credit.setType(TransactionType.CASHOUT);
credit.setStatus(TransactionStatus.PENDING);
credit.setUserCashOut(userCashOut);
userCashOut.getCredits().add(credit);
debitInfo.credit = credit;
ses.save(credit);
i++;
if (checkAmount <= 0) {
break;
}
}
int size = freeDebits.size();
for (int j = i; j < size; j++) {
freeDebits.remove(i);
}
return checkAmount;
}
@SuppressWarnings("unchecked")
private List<CashOutDebitInfo> findFreeDebits(Player player, Session ses) {
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.MONTH, -6);
Query query = ses.createQuery("from Transaction as t where "
+ "t.player = :player and t.createDate > :date "
+ "and t.creditStatus is null and t.type = :type and "
+ "(t.amount > (select sum(-t2.amount) from t.creditTransactions as t2) "
+ "or t.creditTransactions is empty) "
//+ "where t2.status = :status) or t.creditTransactions is empty) "
+ "and t.status = :status " + "and t.externalId is not null "
+ "order by t.createDate");
query.setEntity("player", player);
query.setDate("date", calendar.getTime());
query.setInteger("type", TransactionType.DEPOSIT.getId());
query.setInteger("status", TransactionStatus.COMPLETED.getId());
//query.setInteger("status", TransactionStatus.COMPLETED.getId());
List<Transaction> transactions = query.list();
List<CashOutDebitInfo> freeDebits = new ArrayList<CashOutDebitInfo>();
for (Transaction transaction : transactions) {
Set<Transaction> credits = transaction.getCreditTransactions();
double sum = 0;
for (Transaction credit : credits) {
sum += credit.getAmount();
}
CashOutDebitInfo info = new CashOutDebitInfo();
info.debit = transaction;
info.remainder = transaction.getAmount() - sum;
freeDebits.add(info);
}
return freeDebits;
}
}
java/java-tests/testData/psi/formatter/java/paymentManager_after.java
+328
View File
@@ -0,0 +1,328 @@
package cms.si.payment;
import cms.AmountMoreThanBalanceException;
import cms.db.*;
import cms.db.payments.px.PayConRequest;
import cms.db.payments.px.PayConResponse;
import cms.db.payments.px.PayConStatus;
import cms.hibernate.HibernateSessionFactory;
import cms.si.payment.px.PayConPaymentSystem;
import cms.si.payment.px.PaymentException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.Query;
import org.hibernate.Session;
import javax.servlet.http.HttpServletRequest;
import java.util.*;
/**
* @author alf
* @author Alexey Malkovskiy
*/
public class PaymentManager {
private static final Log log = LogFactory.getLog(PaymentManager.class);
public static final int TRANSACTION_PENDING = 1;
public static final int TRANSACTION_PROCESSED = 2;
public static final int TRANSACTION_DECLINED = 3;
public BillingInfo billCreditCard(Player player, Long transactionID, CreditCard card,
double amount, String ipAddress, String customerRef) throws WrongAmountException, PaymentException {
player.setUpdateDate(new Date());
PayConPaymentSystem px = PayConPaymentSystem.getInstance();
String strTransactionID = px.getTrackID(transactionID);
// here comes authorization code
PayConRequest request = px.createAuthRequest(player.getCurrency().getId(),
strTransactionID, card, amount, ipAddress, player.getUsername());
PayConResponse response = px.sendRequest(request);
if (response.getReturnCode() != ReturnCode.RETURN_CODE_SUCCESS ||
response.getStatus().getAuthCode() != AuthorizationFailureObject.SUCCESS)
throw new PaymentException();
double paid = response.getStatus().getAmountPaid();
if (amount != paid)
throw new WrongAmountException(amount, paid);
player.incrementBalance(paid);
log.info("billCreditCard player " + player.getId() + " TrackID " + strTransactionID
+ " added " + amount
+ " to balance because the credit card was charged for this amount");
return new BillingInfo(response.getStatus().getAmountPaid(),
response.getStatus().getAmountReq(),
response.getStatus().getTransactionId());
}
public void performDeposit(double amount, Player player, CreditCardInfo info,
HttpServletRequest request, String remoteHost) throws PaymentException, WrongAmountException {
org.hibernate.Transaction tx = HibernateSessionFactory.currentSession().beginTransaction();
Transaction t = new Transaction();
t.setAmount(amount);
t.setType(TransactionType.DEPOSIT);
t.setStatus(TransactionStatus.PENDING);
t.setCreateDate(new Date());
t.setPlayer(player);
saveNow(t);
try {
BillingInfo billingInfo = billCreditCard(player, t.getId(), info, amount, remoteHost,
player.getUsername());
t.setStatus(TransactionStatus.COMPLETED);
t.setExternalId(billingInfo.getTransactionId());
t.setProcessDate(new Date());
} catch (PaymentException e) {
log.error("Payment problem", e);
// TODO
} catch (WrongAmountException e) {
log.error("Wrong amount", e);
// TODO
}
tx.commit
();
}
private void saveNow(Transaction t) {
Session session = HibernateSessionFactory.currentSession();
session.
save(t);
session.
flush();
}
@SuppressWarnings(
"unchecked")
public UserCashOut performCashOut(double amount, Player player) throws AmountMoreThanBalanceException {
Session ses = HibernateSessionFactory.
currentSession();
if (player.getBalanceAmt() < amount) {
throw new AmountMoreThanBalanceException();
}
org.
hibernate.
Transaction tx = ses.
beginTransaction();
UserCashOut userCashOut = new UserCashOut(
);
userCashOut.setAmount(amount);
userCashOut.setCreateDate(new Date());
userCashOut.setPlayer(player);
player.getCashOuts().add(userCashOut);
ses.save(userCashOut);
double checkAmount = 0;
double amountForPay = amount;
boolean freeDebitsExist = true;
//
while (amountForPay > 0 && freeDebitsExist) {
List<CashOutDebitInfo> freeDebits = findFreeDebits(player, ses);
if (freeDebits.isEmpty()) {
freeDebitsExist = false;
checkAmount += amountForPay;
} else {
double oldAmount = amountForPay;
amountForPay = createCredits(amountForPay, player, freeDebits, userCashOut, ses);
amountForPay += payCredits(freeDebits, userCashOut, ses);
if (amountForPay == oldAmount) {
//This is strange and hypothetical situation. It can mean
//that PaymentConnexions doesn't work properly. Pay by check.
freeDebitsExist = false;
checkAmount += amountForPay;
}
}
ses.flush();
}
//
if (checkAmount > 0) {
payCheck(player, ses, userCashOut, checkAmount);
}
player.setBalanceAmt(player.getBalanceAmt() - amount);
tx.commit();
return userCashOut;
}
private void payCheck(Player player, Session ses, UserCashOut userCashOut, double checkAmount) {
Check check = new Check();
check.setAmount(checkAmount);
check.setCreateDate(new Date());
check.setPlayer(player);
player.getChecks().add(check);
check.setUserCashOut(userCashOut);
userCashOut.setCheck(check);
Transaction transaction = new Transaction();
transaction.setAmount(-checkAmount);
transaction.setCreateDate(new Date());
transaction.setProcessDate(new Date());
transaction.setType(TransactionType.CASHOUT);
transaction.setStatus(TransactionStatus.PENDING);
transaction.setPlayer(player);
check.setTransaction(transaction);
transaction.setCheck(check);
ses.save(transaction);
ses.save(check);
}
private double payCredits(List<CashOutDebitInfo> freeDebits, UserCashOut userCashOut, Session ses) {
double unpaidAmount = 0;
for (CashOutDebitInfo info : freeDebits) {
try {
String trackId = "Tr" + info.credit.getId();
PayConRequest creditRequest = PayConPaymentSystem.getInstance().createReversalRequest(userCashOut.getPlayer().getCurrency().getId(), trackId, -info.credit.getAmount(), new Long(info.debit.getExternalId()));
PayConResponse response = PayConPaymentSystem.getInstance().sendRequest(creditRequest);
final PayConStatus status = response.getStatus();
if (response.getReturnCode() == ReturnCode.RETURN_CODE_SUCCESS && status.getAuthCode() == AuthorizationFailureObject.SUCCESS) {
info.credit.setAmount(-status.getAmountPaid());
info.credit.setExternalId(status.getTransactionId());
info.credit.setStatus(TransactionStatus.COMPLETED);
info.credit.setProcessDate(new Date());
} else {
switch (status.getAuthCode()) {
case TRANSACTION_PENDING:
info.credit.setStatus(TransactionStatus.PENDING);
break;
case TRANSACTION_PROCESSED:
//This is hypothetical situation. We have to delete this credit
//transaction. Original debit transaction still free for
//future credits.
ses.delete(info.credit);
info.credit = null;
break;
case TRANSACTION_DECLINED:
default:
info.debit.getCreditTransactions().remove(info.credit);
info.credit.setOriginalDebitTransaction(null);
info.debit.setCreditStatus("ERROR - " + status.getAuthCode());
userCashOut.getCredits().remove(info.credit);
info.credit.setUserCashOut(null);
unpaidAmount += -info.credit.getAmount();
ses.delete(info.credit);
break;
}
}
} catch (PaymentException e) {
// ignore
//log.error(e.getMessage(), e);
}
}
return unpaidAmount;
}
private double createCredits(double amount, Player player, List<CashOutDebitInfo> freeDebits, UserCashOut userCashOut, Session ses) {
double checkAmount = amount;
int i = 0;
for (CashOutDebitInfo debitInfo : freeDebits) {
Transaction credit = new Transaction();
if (checkAmount > debitInfo.remainder) {
credit.setAmount(-debitInfo.remainder);
checkAmount -= debitInfo.remainder;
} else {
credit.setAmount(-checkAmount);
checkAmount = 0;
}
credit.setCreateDate(new Date());
credit.setOriginalDebitTransaction(debitInfo.debit);
debitInfo.debit.getCreditTransactions().add(credit);
credit.setPlayer(player);
credit.setType(TransactionType.CASHOUT);
credit.setStatus(TransactionStatus.PENDING);
credit.setUserCashOut(userCashOut);
userCashOut.getCredits().add(credit);
debitInfo.credit = credit;
ses.save(credit);
i++;
if (checkAmount <= 0) {
break;
}
}
int size = freeDebits.size();
for (int j = i; j < size; j++) {
freeDebits.remove(i);
}
return checkAmount;
}
@SuppressWarnings("unchecked")
private List<CashOutDebitInfo> findFreeDebits(Player player, Session ses) {
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.MONTH, -6);
Query query = ses.createQuery("from Transaction as t where " + "t.player = :player and t.createDate > :date " + "and t.creditStatus is null and t.type = :type and " + "(t.amount > (select sum(-t2.amount) from t.creditTransactions as t2) " + "or t.creditTransactions is empty) "
//+ "where t2.status = :status) or t.creditTransactions is empty) "
+ "and t.status = :status " + "and t.externalId is not null " + "order by t.createDate");
query.setEntity("player", player);
query.setDate("date", calendar.getTime());
query.setInteger("type", TransactionType.DEPOSIT.getId());
query.setInteger("status", TransactionStatus.COMPLETED.getId());
//query.setInteger("status", TransactionStatus.COMPLETED.getId());
List<Transaction> transactions = query.list();
List<CashOutDebitInfo> freeDebits = new ArrayList<CashOutDebitInfo>();
for (Transaction transaction : transactions) {
Set<Transaction> credits = transaction.getCreditTransactions();
double sum = 0;
for (Transaction credit : credits) {
sum += credit.getAmount();
}
CashOutDebitInfo info = new CashOutDebitInfo();
info.debit = transaction;
info.remainder = transaction.getAmount() - sum;
freeDebits.add(info);
}
return freeDebits;
}
}
java/java-tests/testData/psi/formatter/java/performance.java
+3870
View File
File diff suppressed because it is too large Load Diff
java/java-tests/testData/psi/formatter/java/performance2.java
+7
View File
File diff suppressed because one or more lines are too long
java/java-tests/testData/psi/formatter/java/performance2_after.java
+7
View File
File diff suppressed because one or more lines are too long
java/java-tests/testData/psi/formatter/java/performance3.java
+130
View File
@@ -0,0 +1,130 @@
package scrap;
/**
*/
public interface A1024 {
private static final BusinessClass[] pool_DUMMY79 =
{
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
new BusinessClass("Description_1", new MortalityTable.PersonalDetails(MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY(1, 10, 1950), false, 0.85), 2200000, new Bday100Roll(calCalc.getTimeFromMDY(6, 16, 1926))),
};
}
java/java-tests/testData/psi/formatter/java/performance3_after.java
+130
View File
@@ -0,0 +1,130 @@
package scrap;
/**
*/
public interface A1024 {
private static final BusinessClass[] pool_DUMMY79 =
{
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
new BusinessClass ("Description_1", new MortalityTable.PersonalDetails (MortalityTable.Gender.FEMALE, calCalc.getTimeFromMDY (1, 10, 1950), false, 0.85), 2200000, new Bday100Roll (calCalc.getTimeFromMDY (6, 16, 1926))),
};
}
java/java-tests/testData/psi/formatter/tabIndenting/SCR6197.java
+4
View File
@@ -0,0 +1,4 @@
class Test{
/*
*/
}
java/java-tests/testData/psi/formatter/tabIndenting/SCR6197_after.java
+5
View File
@@ -0,0 +1,5 @@
class Test {
/*
*/
}
java/java-tests/testData/psi/formatter/tabIndenting/SmartTab2_after.java
+9
View File
@@ -0,0 +1,9 @@
class A {
int a;
void foo(int a,
int b) {
boolean b;
}
}
java/java-tests/testData/psi/formatter/tabIndenting/SmartTab4_after.java
+9
View File
@@ -0,0 +1,9 @@
class A {
int a;
void foo(int a,
int b) {
boolean b;
}
}
java/java-tests/testData/psi/formatter/tabIndenting/SmartTab8_after.java
+9
View File
@@ -0,0 +1,9 @@
class A {
int a;
void foo(int a,
int b) {
boolean b;
}
}
java/java-tests/testData/psi/formatter/tabIndenting/Space_after.java
+9
View File
@@ -0,0 +1,9 @@
class A {
int a;
void foo(int a,
int b) {
boolean b;
}
}
java/java-tests/testData/psi/formatter/tabIndenting/Tab2_after.java
+9
View File
@@ -0,0 +1,9 @@
class A {
int a;
void foo(int a,
int b) {
boolean b;
}
}
java/java-tests/testData/psi/formatter/tabIndenting/Tab4_after.java
+9
View File
@@ -0,0 +1,9 @@
class A {
int a;
void foo(int a,
int b) {
boolean b;
}
}
java/java-tests/testData/psi/formatter/tabIndenting/Tab8_after.java
+9
View File
@@ -0,0 +1,9 @@
class A {
int a;
void foo(int a,
int b) {
boolean b;
}
}
java/java-tests/testData/psi/formatter/tabIndenting/Test.java
+8
View File
@@ -0,0 +1,8 @@
class A{
int a;
void foo(int a,
int b){
boolean b;
}
}
java/java-tests/testData/psi/formatter/wrapping/BinaryOperation.java
+6
View File
@@ -0,0 +1,6 @@
public class Foo {
{
x = a + b + c + d * e;
}
}
java/java-tests/testData/psi/formatter/wrapping/BinaryOperation_chopped.java
+9
View File
@@ -0,0 +1,9 @@
public class Foo {
{
x = a +
b +
c +
d * e;
}
}
java/java-tests/testData/psi/formatter/wrapping/BinaryOperation_chopped_signmoved.java
+9
View File
@@ -0,0 +1,9 @@
public class Foo {
{
x = a
+ b
+ c
+ d * e;
}
}
java/java-tests/testData/psi/formatter/wrapping/BinaryOperation_normal.java
+7
View File
@@ -0,0 +1,7 @@
public class Foo {
{
x = a + b + c +
d * e;
}
}
java/java-tests/testData/psi/formatter/wrapping/CallNoParameteresList.java
+6
View File
@@ -0,0 +1,6 @@
public class Test {
public void foo() {
hereIsSomeLongNameMethodCalledWhenNoParams();
}
}
java/java-tests/testData/psi/formatter/wrapping/CallNoParameteresList_after.java
+6
View File
@@ -0,0 +1,6 @@
public class Test {
public void foo() {
hereIsSomeLongNameMethodCalledWhenNoParams();
}
}
java/java-tests/testData/psi/formatter/wrapping/CallParameterList.java
+6
View File
@@ -0,0 +1,6 @@
public class Foo {
public static void foo() {
bar(bar(1, 2, 3), bar(3, 4, 5), bar(6, 7, 8));
}
}
java/java-tests/testData/psi/formatter/wrapping/CallParameterList_chopped.java
+8
View File
@@ -0,0 +1,8 @@
public class Foo {
public static void foo() {
bar(bar(1, 2, 3),
bar(3, 4, 5),
bar(6, 7, 8));
}
}
java/java-tests/testData/psi/formatter/wrapping/CallParameterList_chopped_bothparenmoved.java
+10
View File
@@ -0,0 +1,10 @@
public class Foo {
public static void foo() {
bar(
bar(1, 2, 3),
bar(3, 4, 5),
bar(6, 7, 8)
);
}
}
java/java-tests/testData/psi/formatter/wrapping/CallParameterList_chopped_parenmoved.java
+9
View File
@@ -0,0 +1,9 @@
public class Foo {
public static void foo() {
bar(bar(1, 2, 3),
bar(3, 4, 5),
bar(6, 7, 8)
);
}
}
java/java-tests/testData/psi/formatter/wrapping/CallParameterList_normal.java
+7
View File
@@ -0,0 +1,7 @@
public class Foo {
public static void foo() {
bar(bar(1, 2, 3), bar(3, 4, 5),
bar(6, 7, 8));
}
}
java/java-tests/testData/psi/formatter/wrapping/ChainedCallsAndParams.java
+14
View File
@@ -0,0 +1,14 @@
public class Test_ASPECT {
public static final com.intellij.aspects.rt.pointcut.Pointcut test1_POINTCUT =
new com.intellij.aspects.rt.pointcut.MethodCallPointcut(
new com.intellij.aspects.rt.pattern.BasicMethodPattern(
null,
new com.intellij.aspects.rt.pattern.ExactTypePattern("V"),
new com.intellij.aspects.rt.pattern.ExactTypePattern(new org.apache.bcel.generic.ObjectType(Point.class.getName())),
new com.intellij.aspects.rt.pattern.RegexpIdentifierPattern("setX"),
new com.intellij.aspects.rt.pattern.BasicTypeListPattern(
)
)
);
}
java/java-tests/testData/psi/formatter/wrapping/ChainedCallsAndParams_normal.java
+14
View File
@@ -0,0 +1,14 @@
public class Test_ASPECT {
public static final com.intellij.aspects.rt.pointcut.Pointcut test1_POINTCUT =
new com.intellij.aspects.rt.pointcut.MethodCallPointcut(
new com.intellij.aspects.rt.pattern.BasicMethodPattern(
null,
new com.intellij.aspects.rt.pattern.ExactTypePattern("V"),
new com.intellij.aspects.rt.pattern.ExactTypePattern(new org.apache.bcel.generic.ObjectType(
Point.class.getName())),
new com.intellij.aspects.rt.pattern.RegexpIdentifierPattern("setX"),
new com.intellij.aspects.rt.pattern.BasicTypeListPattern(
)
)
);
}
java/java-tests/testData/psi/formatter/wrapping/ChainedMethodCall.java
+6
View File
@@ -0,0 +1,6 @@
public class Foo {
public static Foo foo(int i1, int i2, int i3) {
Foo.foo(1, 2, 3).foo(4, 5, 6).foo(7, 8, 9).foo(x, y, z);
}
}
java/java-tests/testData/psi/formatter/wrapping/ChainedMethodCall_chopped.java
+9
View File
@@ -0,0 +1,9 @@
public class Foo {
public static Foo foo(int i1, int i2, int i3) {
Foo.foo(1, 2, 3)
.foo(4, 5, 6)
.foo(7, 8, 9)
.foo(x, y, z);
}
}
java/java-tests/testData/psi/formatter/wrapping/ChainedMethodCall_normal.java
+7
View File
@@ -0,0 +1,7 @@
public class Foo {
public static Foo foo(int i1, int i2, int i3) {
Foo.foo(1, 2, 3).foo(4, 5, 6).foo(7, 8, 9)
.foo(x, y, z);
}
}
java/java-tests/testData/psi/formatter/wrapping/ExtendsListWrapping.java
+3
View File
@@ -0,0 +1,3 @@
public interface Foo extends Bar1, Bar2 , Bar3 ,Bar5 {
}
java/java-tests/testData/psi/formatter/wrapping/ExtendsListWrapping_chopped.java
+6
View File
@@ -0,0 +1,6 @@
public interface Foo extends Bar1,
Bar2,
Bar3,
Bar5 {
}
java/java-tests/testData/psi/formatter/wrapping/ExtendsListWrapping_normal.java
+4
View File
@@ -0,0 +1,4 @@
public interface Foo extends Bar1, Bar2,
Bar3, Bar5 {
}
java/java-tests/testData/psi/formatter/wrapping/ExtendsWrappingForced.java
+3
View File
@@ -0,0 +1,3 @@
public class Foo extends Bar {
}
java/java-tests/testData/psi/formatter/wrapping/ExtendsWrappingForced_after.java
+4
View File
@@ -0,0 +1,4 @@
public class Foo
extends Bar {
}
java/java-tests/testData/psi/formatter/wrapping/ForStatement.java
+10
View File
@@ -0,0 +1,10 @@
public class Foo {
public void foo() {
for(int i = 0; i < 10; i++) {
}
for(int thisShouldBeWrapped = 0; thisShouldBeWrapped < 10; thisShouldBeWrapped++) {
}
}
}
java/java-tests/testData/psi/formatter/wrapping/ForStatement_both.java
+14
View File
@@ -0,0 +1,14 @@
public class Foo {
public void foo() {
for (int i = 0; i < 10; i++) {
}
for (
int thisShouldBeWrapped = 0;
thisShouldBeWrapped < 10;
thisShouldBeWrapped++
) {
}
}
}
java/java-tests/testData/psi/formatter/wrapping/ForStatement_lparen.java
+13
View File
@@ -0,0 +1,13 @@
public class Foo {
public void foo() {
for (int i = 0; i < 10; i++) {
}
for (
int thisShouldBeWrapped = 0;
thisShouldBeWrapped < 10;
thisShouldBeWrapped++) {
}
}
}
java/java-tests/testData/psi/formatter/wrapping/ForStatement_normal.java
+12
View File
@@ -0,0 +1,12 @@
public class Foo {
public void foo() {
for (int i = 0; i < 10; i++) {
}
for (int thisShouldBeWrapped = 0;
thisShouldBeWrapped < 10;
thisShouldBeWrapped++) {
}
}
}
java/java-tests/testData/psi/formatter/wrapping/ForStatement_rparen.java
+13
View File
@@ -0,0 +1,13 @@
public class Foo {
public void foo() {
for (int i = 0; i < 10; i++) {
}
for (int thisShouldBeWrapped = 0;
thisShouldBeWrapped < 10;
thisShouldBeWrapped++
) {
}
}
}
java/java-tests/testData/psi/formatter/wrapping/IncompleteFor.java
+8
View File
@@ -0,0 +1,8 @@
public class Foo {
{
for (int i = 0; i < 0;) {
System.out.println("something");
}
}
}
java/java-tests/testData/psi/formatter/wrapping/IncompleteFor_after.java
+9
View File
@@ -0,0 +1,9 @@
public class Foo {
{
for (int i = 0;
i < 0; ) {
System.out.println("something");
}
}
}
java/java-tests/testData/psi/formatter/wrapping/KillSpacesInEmptyLine.java
+8
View File
@@ -0,0 +1,8 @@
public class Foo {
public void foo() {
statement1();
statement2();
}
}
java/java-tests/testData/psi/formatter/wrapping/KillSpacesInEmptyLine_after.java
+8
View File
@@ -0,0 +1,8 @@
public class Foo {
public void foo() {
statement1();
statement2();
}
}
java/java-tests/testData/psi/formatter/wrapping/MethodParameterList.java
+5
View File
@@ -0,0 +1,5 @@
public class Foo {
public static void foo(int arg1, int arg2, int arg3) {
}
}
java/java-tests/testData/psi/formatter/wrapping/MethodParameterList_chopped.java
+7
View File
@@ -0,0 +1,7 @@
public class Foo {
public static void foo(int arg1,
int arg2,
int arg3) {
}
}
java/java-tests/testData/psi/formatter/wrapping/MethodParameterList_chopped_parenmoved.java
+8
View File
@@ -0,0 +1,8 @@
public class Foo {
public static void foo(int arg1,
int arg2,
int arg3
) {
}
}
java/java-tests/testData/psi/formatter/wrapping/MethodParameterList_normal.java
+6
View File
@@ -0,0 +1,6 @@
public class Foo {
public static void foo(int arg1, int arg2,
int arg3) {
}
}
java/java-tests/testData/psi/formatter/wrapping/ModifierList.java
+5
View File
@@ -0,0 +1,5 @@
public class Foo {
public static void foo(int i1, int i2) {
}
}
java/java-tests/testData/psi/formatter/wrapping/ModifierList_after.java
+7
View File
@@ -0,0 +1,7 @@
public
class Foo {
public static
void foo(int i1, int i2) {
}
}
java/java-tests/testData/psi/formatter/wrapping/NestedLongCalls.java
+4
View File
@@ -0,0 +1,4 @@
public class Foo {
public void foo() { super.foo("Parameter here"); }
}
java/java-tests/testData/psi/formatter/wrapping/NestedLongCalls_after.java
+6
View File
@@ -0,0 +1,6 @@
public class Foo {
public void foo() {
super.foo("Parameter here");
}
}
java/java-tests/testData/psi/formatter/wrapping/ParenthesizedExpressionWrap.java
+6
View File
@@ -0,0 +1,6 @@
public class Foo {
{
x = (a.foo(1, 2, 3) + variable2);
}
}
java/java-tests/testData/psi/formatter/wrapping/ParenthesizedExpressionWrap_both.java
+10
View File
@@ -0,0 +1,10 @@
public class Foo {
{
x = (
a.foo(1,
2,
3) + variable2
);
}
}
java/java-tests/testData/psi/formatter/wrapping/ParenthesizedExpressionWrap_left.java
+9
View File
@@ -0,0 +1,9 @@
public class Foo {
{
x = (
a.foo(1,
2,
3) + variable2);
}
}
java/java-tests/testData/psi/formatter/wrapping/ParenthesizedExpressionWrap_right.java
+9
View File
@@ -0,0 +1,9 @@
public class Foo {
{
x = (a.foo(1,
2,
3) + variable2
);
}
}

Some files were not shown because too many files have changed in this diff Show More