Commit 13568cfb authored by Adam Knapp's avatar Adam Knapp Committed by Arpad Lovassy

Reordering modifiers

Signed-off-by: Adam Knapp's avatarAdam Knapp <adam.knapp@ericsson.com>
parent f34db9d1
......@@ -39,25 +39,25 @@ import org.eclipse.titan.designer.parsers.ttcn3parser.TTCN3ReparseUpdater;
public class Single_ValueRedirection extends ASTNode implements ILocateableNode, IIncrementallyUpdateable {
/** reference to the variable the value is redirected to */
final private Reference variableReference;
private final Reference variableReference;
/**
* indicates which part (record field or array element) of the value is
* redirected (optional)
*/
final private ArrayList<ISubReference> subreferences;
private final ArrayList<ISubReference> subreferences;
/**
* indicates whether the redirected field or element should be decoded
* (only used if subrefs is not null)
*/
final private boolean decoded;
private final boolean decoded;
/**
* encoding format for decoded universal charstring value redirects
* (only used if subrefs is not null and decoded is true)
*/
final private Value encodingString;
private final Value encodingString;
/**
* pointer to the type the redirected field or element is decoded into
......
......@@ -54,7 +54,7 @@ import org.eclipse.titan.designer.parsers.ttcn3parser.TTCN3ReparseUpdater;
* */
public class Value_Redirection extends ASTNode implements ILocateableNode, IIncrementallyUpdateable {
final private ArrayList<Single_ValueRedirection> valueRedirections;
private final ArrayList<Single_ValueRedirection> valueRedirections;
// pointer to the type of the redirected value, not owned here
private IType valueType = null;
......
......@@ -1142,7 +1142,7 @@ public abstract class TTCN3Template extends GovernedSimple implements IReference
* project property setting
* TITANFlagsOptionsData.ALLOW_OMIT_IN_VALUELIST_TEMPLATE_PROPERTY
*/
static final public boolean allowOmitInValueList(final Location location, final boolean allowOmit) {
public static final boolean allowOmitInValueList(final Location location, final boolean allowOmit) {
if( !allowOmit ) {
return false;
}
......
......@@ -249,9 +249,9 @@ public final class PortGenerator {
* originally port_msg_provider is something like this
* */
public static class portMessageProvider {
final private String name;
final private ArrayList<String> outMessageTypeNames;
final private boolean realtime;
private final String name;
private final ArrayList<String> outMessageTypeNames;
private final boolean realtime;
public portMessageProvider(final String name, final ArrayList<String> outMessageTypeNames, final boolean realtime) {
this.name = name;
......
......@@ -104,14 +104,14 @@ public abstract class Type extends Governor implements IType, IIncrementallyUpda
public static final String REFTOVALUEEXPECTED_INSTEADOFCALL = "Reference to a value was expected instead of a call of {0}, which return a template";
private static final String TYPECOMPATWARNING = "Type compatibility between `{0}'' and `{1}''";
public final static int JSON_NONE = 0x00; // no value type set (default)
public final static int JSON_NUMBER = 0x01; // integer and float
public final static int JSON_STRING = 0x02; // all string types, the objid type, the verdict type and enumerated values
public final static int JSON_BOOLEAN = 0x04; // boolean (true or false)
public final static int JSON_OBJECT = 0x08; // records, sets, unions and the anytype
public final static int JSON_ARRAY = 0x10; // record of, set of and array
public final static int JSON_NULL = 0x20; // ASN.1 null type
public final static int JSON_ANY_VALUE = 0x3F; // unions with the "as value" coding instruction
public static final int JSON_NONE = 0x00; // no value type set (default)
public static final int JSON_NUMBER = 0x01; // integer and float
public static final int JSON_STRING = 0x02; // all string types, the objid type, the verdict type and enumerated values
public static final int JSON_BOOLEAN = 0x04; // boolean (true or false)
public static final int JSON_OBJECT = 0x08; // records, sets, unions and the anytype
public static final int JSON_ARRAY = 0x10; // record of, set of and array
public static final int JSON_NULL = 0x20; // ASN.1 null type
public static final int JSON_ANY_VALUE = 0x3F; // unions with the "as value" coding instruction
/** the parent type of this type */
private IType parentType;
......
......@@ -38,7 +38,7 @@ import org.eclipse.ui.PlatformUI;
public final class BrokenPartsViaReferences extends SelectionMethodBase {
// when the definition based search for parts to be analyzed exceeds this limit we switch back to the import based method.
// 1 second in nanoseconds
private final static long TIMELIMIT = 10 * (long)1e+9;
private static final long TIMELIMIT = 10 * (long)1e+9;
/**
* When the percentage of broken modules is bigger than this limit
......@@ -46,7 +46,7 @@ public final class BrokenPartsViaReferences extends SelectionMethodBase {
*
* Otherwise the assignment level detection would take too long.
*/
private final static float BROKEN_MODULE_LIMIT = 10;
private static final float BROKEN_MODULE_LIMIT = 10;
private final CompilationTimeStamp timestamp;
private final Map<Module, List<Assignment>> moduleAndBrokenAssignments;
......
......@@ -176,7 +176,7 @@ public abstract class GenerateRunConfigBase extends AbstractHandler implements I
* @param file The selected Titan configuration file
* @throws CoreException
*/
abstract protected void generateRunConfig(final IFile file) throws CoreException;
protected abstract void generateRunConfig(final IFile file) throws CoreException;
@Override
/** {@inheritDoc} */
......
......@@ -35,7 +35,7 @@ import org.eclipse.titan.designer.parsers.ProjectSourceParser;
* @author Adam Knapp
*/
public final class ProjectSourceCompiler {
private final static String PACKAGE_RUNTIME_ROOT = "org.eclipse.titan.runtime.core";
private static final String PACKAGE_RUNTIME_ROOT = "org.eclipse.titan.runtime.core";
/**
* Private constructor to disable accidental instantiation.
......
......@@ -130,7 +130,7 @@ public final class AdditionalFunctions {
41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 80, 80, 80, 80, 80
};
private final static char base64padding = '=';
private static final char base64padding = '=';
private AdditionalFunctions() {
//intentionally private to disable instantiation
......@@ -4943,7 +4943,7 @@ public final class AdditionalFunctions {
//TODO update with Java 1.7 to ThreadLocalRandom
private static boolean rndSeedSet = false;
private final static Random random = new Random();
private static final Random random = new Random();
public static void set_rnd_seed(final double floatSeed) {
TitanFloat.check_numeric(floatSeed,"The seed value of function rnd()");
......
......@@ -21,7 +21,7 @@ import java.util.List;
*/
public final class Event_Handler {
static abstract class Channel_Event_Handler {
abstract static class Channel_Event_Handler {
//FIXME implement rest
public abstract void Handle_Event(final SelectableChannel channel, final boolean is_readable, final boolean is_writeable);
......
......@@ -30,7 +30,7 @@ public final class Param_Types {
* FIXME a lot to implement here
* Right now this is just a placeholder so that some could start working on module parameters.
*/
public static abstract class Module_Parameter {
public abstract static class Module_Parameter {
// list of all derived classes that can be instantiated
public enum type_t {
......
......@@ -24,7 +24,7 @@ import org.eclipse.titan.runtime.core.TTCN_EncDec.raw_order_t;
* @author Arpad Lovassy
*/
public final class TTCN_Buffer {
final static private int INITIAL_SIZE = 1024;
final private static int INITIAL_SIZE = 1024;
private byte data_ptr[];
......
......@@ -36,7 +36,7 @@ public final class TTCN_Logger {
public static final Logging_Bits log_everything = new Logging_Bits();
public static final Logging_Bits default_console_mask = new Logging_Bits();
final public boolean bits[] = new boolean[Severity.values().length];
public final boolean bits[] = new boolean[Severity.values().length];
// static initializer
static {
......
......@@ -18,8 +18,8 @@ import java.util.concurrent.atomic.AtomicInteger;
* @author Kristof Szabados
*/
public final class Text_Buf {
final static private int BUF_SIZE = 1000;
final static private int BUF_HEAD = 24;
private static final int BUF_SIZE = 1000;
private static final int BUF_HEAD = 24;
// the size of the buffer (allocated bytes)
private int buf_size;
......
......@@ -62,16 +62,16 @@ public final class DefineSectionHandler {
}
// pattern for matching macro string, for example: \$a
private final static String PATTERN_STRING_MACRO = "\\$\\s*([A-Za-z][A-Za-z0-9_]*)\\s*";
private final static Pattern PATTERN_MACRO = Pattern.compile(PATTERN_STRING_MACRO);
private static final String PATTERN_STRING_MACRO = "\\$\\s*([A-Za-z][A-Za-z0-9_]*)\\s*";
private static final Pattern PATTERN_MACRO = Pattern.compile(PATTERN_STRING_MACRO);
// pattern for matching macro string with brace, for example: \${a}
private final static String PATTERN_STRING_MACRO_BRACE = "\\$\\s*\\{\\s*([A-Za-z][A-Za-z0-9_]*)\\s*\\}";
private final static Pattern PATTERN_MACRO_BRACE = Pattern.compile(PATTERN_STRING_MACRO_BRACE);
private static final String PATTERN_STRING_MACRO_BRACE = "\\$\\s*\\{\\s*([A-Za-z][A-Za-z0-9_]*)\\s*\\}";
private static final Pattern PATTERN_MACRO_BRACE = Pattern.compile(PATTERN_STRING_MACRO_BRACE);
// pattern for matching typed macro string, for example: \${a, float}
private final static String PATTERN_STRING_TYPED_MACRO = "\\$\\s*\\{\\s*([A-Za-z][A-Za-z0-9_]*)\\s*,\\s*[A-Za-z][A-Za-z0-9_]*\\s*\\}";
private final static Pattern PATTERN_TYPED_MACRO = Pattern.compile(PATTERN_STRING_TYPED_MACRO);
private static final String PATTERN_STRING_TYPED_MACRO = "\\$\\s*\\{\\s*([A-Za-z][A-Za-z0-9_]*)\\s*,\\s*[A-Za-z][A-Za-z0-9_]*\\s*\\}";
private static final Pattern PATTERN_TYPED_MACRO = Pattern.compile(PATTERN_STRING_TYPED_MACRO);
/**
* Extracts macro name from macro string
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment