format java code

This commit is contained in:
2016-01-15 14:37:34 +01:00
parent 8162aa6c3e
commit 8cb067bfda
37 changed files with 6480 additions and 5825 deletions
@@ -713,10 +713,9 @@ public abstract class Action implements GraphSourceItem {
public abstract boolean execute(LocalDataArea lda);
/* {
//throw new UnsupportedOperationException("Action " + toString() + " not implemented");
return false;
}*/
//throw new UnsupportedOperationException("Action " + toString() + " not implemented");
return false;
}*/
/**
* Translates this function to stack and output.
*
@@ -1063,7 +1062,7 @@ public abstract class Action implements GraphSourceItem {
}
/*ActionJump && ActionIf removed*/
/*if ((action instanceof ActionEnumerate2) || (action instanceof ActionEnumerate)) {
/*if ((action instanceof ActionEnumerate2) || (action instanceof ActionEnumerate)) {
loopStart = ip + 1;
isForIn = true;
ip += 4;
@@ -10,9 +10,13 @@ import java.util.Map;
public class ActionScriptFunction extends ActionScriptObject {
protected long functionOffset;
protected long functionLength;
protected String functionName;
protected List<String> paramNames;
protected Map<Integer, String> funcRegNames;
public String getFunctionName() {
@@ -38,5 +42,4 @@ public class ActionScriptFunction extends ActionScriptObject {
public long getFunctionOffset() {
return functionOffset;
}
}
@@ -13,9 +13,11 @@ import java.util.Map;
public class ActionScriptObject implements Cloneable {
protected Map<Integer, Object> properties = new HashMap<>();
protected Map<String, Object> members = new HashMap<>();
protected Object extendsObj;
protected List<Object> implementsObjs = new ArrayList<>();
public void clearMembers() {
@@ -7,7 +7,9 @@ package com.jpexs.decompiler.flash.action;
public class ActionScriptWith {
protected ActionScriptObject obj;
protected long startAddr;
protected long length;
public ActionScriptWith(ActionScriptObject obj, long startAddr, long length) {
@@ -15,5 +17,4 @@ public class ActionScriptWith {
this.startAddr = startAddr;
this.length = length;
}
}
@@ -29,8 +29,11 @@ public class CachedScript implements Serializable {
public String text;
public List<Highlighting> hilights;
public List<Highlighting> methodHilights;
public List<Highlighting> classHilights;
public List<Highlighting> specialHilights;
public CachedScript(String text, List<Highlighting> hilights, List<Highlighting> methodHilights, List<Highlighting> classHilights, List<Highlighting> specialHilights) {
@@ -13,6 +13,5 @@ public class DepthStateObjectAdapter extends ActionScriptObject {
public DepthStateObjectAdapter(DepthState ds) {
this.ds = ds;
}
//TODO
}
@@ -14,8 +14,11 @@ public class DisplayObject extends ActionScriptObject {
protected Map<Integer, Object> displayList = new HashMap<>();
protected int totalFrames = 1;
protected int currentFrame = 1;
protected boolean paused = false;
protected boolean dragging = false;
public void startDrag() {
@@ -14,8 +14,11 @@ import java.util.List;
public class Stage extends DisplayObject {
protected long startTime;
protected Timelined timelined;
protected Timeline timeline;
protected Frame frame;
public Stage(Timelined timelined) {
@@ -72,5 +72,4 @@ public class ActionFSCommand2 extends Action {
public boolean execute(LocalDataArea lda) {
return true; //TODO?
}
}
@@ -33,7 +33,7 @@ import java.util.List;
public class EvalActionItem extends ActionItem {
public EvalActionItem(GraphSourceItem instruction, GraphSourceItem lineStartIns, GraphTargetItem value) {
super(instruction, lineStartIns, PRECEDENCE_PRIMARY, value);
super(instruction, lineStartIns, PRECEDENCE_PRIMARY, value);
}
@Override
@@ -48,7 +48,7 @@ public class LoadMovieActionItem extends ActionItem {
}
public LoadMovieActionItem(GraphSourceItem instruction, GraphSourceItem lineStartIns, GraphTargetItem urlString, GraphTargetItem targetString, int method) {
super(instruction, lineStartIns, PRECEDENCE_PRIMARY);
super(instruction, lineStartIns, PRECEDENCE_PRIMARY);
this.urlString = urlString;
this.targetString = targetString;
this.method = method;
@@ -48,7 +48,7 @@ public class LoadVariablesActionItem extends ActionItem {
}
public LoadVariablesActionItem(GraphSourceItem instruction, GraphSourceItem lineStartIns, GraphTargetItem urlString, GraphTargetItem targetString, int method) {
super(instruction, lineStartIns, PRECEDENCE_PRIMARY);
super(instruction, lineStartIns, PRECEDENCE_PRIMARY);
this.urlString = urlString;
this.targetString = targetString;
this.method = method;
@@ -1,18 +1,19 @@
/*
* Copyright (C) 2010-2016 JPEXS, All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3.0 of the License, or (at your option) any later version.
*
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.␍ */
* License along with this library.
*/
package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.SourceGeneratorLocalData;
@@ -43,7 +44,7 @@ public class UnLoadMovieActionItem extends ActionItem {
}
public UnLoadMovieActionItem(GraphSourceItem instruction, GraphSourceItem lineStartIns, GraphTargetItem targetString) {
super(instruction, lineStartIns, PRECEDENCE_PRIMARY);
super(instruction, lineStartIns, PRECEDENCE_PRIMARY);
this.targetString = targetString;
}
File diff suppressed because it is too large Load Diff