Changeset 12445 in josm for trunk/src/org
- Timestamp:
- 2017-07-01T16:44:05+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
r12260 r12445 154 154 /** whether this is a entry activated by default or not */ 155 155 private boolean defaultEntry; 156 /** The data part of HTTP cookies header in case the service requires cookies to work */157 private String cookies;158 156 /** Whether this service requires a explicit EULA acceptance before it can be activated */ 159 157 private String eulaAcceptanceRequired; … … 842 840 843 841 /** 844 * Return the data part of HTTP cookies header in case the service requires cookies to work845 * @return the cookie data part846 */847 @Override848 public String getCookies() {849 return this.cookies;850 }851 852 /**853 842 * Gets the pixel per degree value 854 843 * @return The ppd value. -
trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
r12013 r12445 160 160 * Constants used in the transformation. 161 161 */ 162 private double b, e;162 private double b, g; 163 163 164 164 /** … … 249 249 } 250 250 } 251 e= f += d;252 e= f * Math.pow(tsfn(latCenter, sinph0), b);251 g = f += d; 252 g = f * Math.pow(tsfn(latCenter, sinph0), b); 253 253 254 254 /* … … 288 288 final double h = Math.pow(tsfn(lat1, Math.sin(lat1)), b); 289 289 final double l = Math.pow(tsfn(lat2, Math.sin(lat2)), b); 290 final double fp = e/ h;290 final double fp = g / h; 291 291 final double p = (l - h) / (l + h); 292 double j = e * e;292 double j = g * g; 293 293 j = (j - l * h) / (j + l * h); 294 294 double diff = lon1 - lon2; … … 379 379 double u, v; 380 380 if (Math.abs(Math.abs(y) - Math.PI/2.0) > EPSILON) { 381 double q = e/ Math.pow(tsfn(y, Math.sin(y)), b);381 double q = g / Math.pow(tsfn(y, Math.sin(y)), b); 382 382 double temp = 1.0 / q; 383 383 double s = 0.5 * (q - temp); … … 420 420 } else { 421 421 return new double[] { 422 cphi2(Math.pow( e/ Math.sqrt((1. + up) / (1. - up)), 1.0 / b)), //calculate t422 cphi2(Math.pow(g / Math.sqrt((1. + up) / (1. - up)), 1.0 / b)), //calculate t 423 423 -Math.atan2(sp * cosgamma0 - vp * singamma0, Math.cos(bra * u)) / b}; 424 424 } -
trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java
r11809 r12445 47 47 */ 48 48 public class MultiSplitPane extends JPanel { 49 private transient AccessibleContext accessibleContext;50 49 private boolean continuousLayout = true; 51 50 private transient DividerPainter dividerPainter = new DefaultDividerPainter(); -
trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
r11747 r12445 43 43 } 44 44 45 private final transient QuadStateDecorator model;45 private final transient QuadStateDecorator cbModel; 46 46 private State[] allowed; 47 47 … … 60 60 @Override public void mousePressed(MouseEvent e) { 61 61 grabFocus(); 62 model.nextState();62 cbModel.nextState(); 63 63 } 64 64 }); … … 69 69 public void actionPerformed(ActionEvent e) { 70 70 grabFocus(); 71 model.nextState();71 cbModel.nextState(); 72 72 } 73 73 }); … … 75 75 SwingUtilities.replaceUIActionMap(this, map); 76 76 // set the model to the adapted model 77 model = new QuadStateDecorator(getModel());78 setModel( model);77 cbModel = new QuadStateDecorator(getModel()); 78 setModel(cbModel); 79 79 setState(initial); 80 80 } … … 101 101 */ 102 102 public final void setPropertyText(final String propertyText) { 103 model.setPropertyText(propertyText);103 cbModel.setPropertyText(propertyText); 104 104 } 105 105 … … 109 109 */ 110 110 public final void setState(State state) { 111 model.setState(state);111 cbModel.setState(state); 112 112 } 113 113 … … 117 117 */ 118 118 public State getState() { 119 return model.getState();119 return cbModel.getState(); 120 120 } 121 121
Note:
See TracChangeset
for help on using the changeset viewer.