Changeset 974


Ignore:
Timestamp:
11/10/15 13:23:41 (9 years ago)
Author:
bln4
Message:

Publicified one of the formatter strings so we can use it for comparing dates.
Attract and Repel Text can now be turned on and off via a static field

Location:
trunk/src/org/expeditee
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/expeditee/items/MagneticConstraint/Actions/AttractTextAction.java

    r963 r974  
    1111                MagneticConstraintActionWithArguments<Float> {
    1212
     13        public static boolean Enabled = true;
     14       
    1315        @Override
    1416        public boolean exec(Item item) {
     
    1820        @Override
    1921        public boolean exec(Item item, Float... args) {
    20                 if(item == null || item.getParent() == null || item.getText().startsWith("@") || !isSpIDERCodePage(item.getParent())) {
     22                if(!Enabled || item == null || item.getParent() == null || item.getText().startsWith("@") || !isSpIDERCodePage(item.getParent())) {
    2123                        return false;
    2224                }
  • trunk/src/org/expeditee/items/MagneticConstraint/Actions/RepelTextAction.java

    r970 r974  
    1414public class RepelTextAction extends
    1515                MagneticConstraintActionWithArguments<Float> {
     16        public static boolean Enabled = true;
    1617
    1718        @Override
     
    2526        @Override
    2627        public boolean exec(final Item item, final Float... args) {
    27                 if(item == null || item.getParent() == null || item.getText().startsWith("@") || !isSpIDERCodePage(item.getParent())) {
     28                if(!Enabled || item == null || item.getParent() == null || item.getText().startsWith("@") || !isSpIDERCodePage(item.getParent())) {
    2829                        return false;
    2930                }
  • trunk/src/org/expeditee/stats/Formatter.java

    r919 r974  
    3333        private static final String TIME_WITH_MILLISECONDS = "mm:ss:SSS";
    3434
    35         private static final String LONG_DATE_TIME_FORMAT = DATE_FORMAT
     35        public static final String LONG_DATE_TIME_FORMAT = DATE_FORMAT
    3636                        + LONG_TIME_FORMAT;
    3737
Note: See TracChangeset for help on using the changeset viewer.