warning: [static] static method should be qualified by type name, ClassFoo, instead of by an expression
Change-Id: Ib05e494efe78c07c6b9e838bf559c191f14109a4
<compilerarg value="-Xlint" />
<!-- Silent some warnings -->
<compilerarg value="-Xlint:-unchecked" />
- <!-- Too borring and painful to fix -->
+ <!-- Too borring and painful to fix -->
<compilerarg value="-Xlint:-rawtypes" />
- <!-- Too borring and painful to fix -->
+ <!-- Too borring and painful to fix -->
<compilerarg value="-Xlint:-path" />
- <!-- Silent the bad path element -->
+ <!-- Silent the bad path element -->
<compilerarg value="-Xlint:-serial" />
- <!-- Silent warning about the serializable -->
+ <!-- Silent warning about the serializable -->
<compilerarg value="-Xlint:-options" />
- <!-- Silent 'bootstrap class path not set in conjunction with -source 1.6'. We don't want to manage the detection of rt.jar. See https://blogs.oracle.com/darcy/entry/bootclasspath_older_source -->
+ <!-- Silent 'bootstrap class path not set in conjunction with -source 1.6'. We don't want to manage the detection of rt.jar. See https://blogs.oracle.com/darcy/entry/bootclasspath_older_source -->
</javac>
</target>
* @param size the font size
*/
public static void setDefaultSize(int size) {
- viewer.defaultSize = size;
+ ScilabLaTeXViewer.defaultSize = size;
}
/**
* @param sep the pane where to remove the LaTeXViewer
*/
public static void removeLaTeXViewer(JTextComponent tc) {
- if (viewer.icon != null) {
- viewer.icon = null;
+ if (ScilabLaTeXViewer.icon != null) {
+ ScilabLaTeXViewer.icon = null;
viewer.setVisible(false);
tc.remove(viewer);
tc.repaint();
latex = exp.substring(n, exp.length() - n);
}
- viewer.icon = ScilabSpecialTextUtilities.compilePartialLaTeXExpression(latex, defaultSize);
- if (viewer.icon == null) {
+ ScilabLaTeXViewer.icon = ScilabSpecialTextUtilities.compilePartialLaTeXExpression(latex, defaultSize);
+ if (ScilabLaTeXViewer.icon == null) {
return 0;
}
- width = viewer.icon.getIconWidth();
- height = viewer.icon.getIconHeight();
+ width = ScilabLaTeXViewer.icon.getIconWidth();
+ height = ScilabLaTeXViewer.icon.getIconHeight();
viewer.setSize(width + 2 * INSET, height + 2 * INSET);
tc.add(viewer);
Rectangle begin;
GraphicController controller = GraphicController.getController();
final int[] props = new int[] {GraphicObjectProperties.__GO_X_AXIS_LABEL__, GraphicObjectProperties.__GO_Y_AXIS_LABEL__, GraphicObjectProperties.__GO_Z_AXIS_LABEL__, GraphicObjectProperties.__GO_TITLE__};
- Integer figureModelUID = GraphicModel.getModel().getFigureModel().getIdentifier();
- Integer axesModelUID = GraphicModel.getModel().getAxesModel().getIdentifier();
+ Integer figureModelUID = GraphicModel.getFigureModel().getIdentifier();
+ Integer axesModelUID = GraphicModel.getAxesModel().getIdentifier();
Integer newFID = controller.createUID();
Integer newAID = controller.createUID();
GraphicModel.getModel().cloneObject(figureModelUID, newFID);
onClickInsert(selectedLegend.polyline);
} else {
/*try pick a label and open the dialog*/
- onClickLabel(entityPicker.pickLabel(figureUid, lastClick));
+ onClickLabel(EntityPicker.pickLabel(figureUid, lastClick));
}
break;
default:
}
public void mouseDragged(MouseEvent arg0) {
- if (eventTranslator.getClickAction() == eventTranslator.javaButton2Scilab(MouseEvent.BUTTON1, SciTranslator.PRESSED, false)) { /* If LEFT BUTTON PRESSED */
+ if (eventTranslator.getClickAction() == SciTranslator.javaButton2Scilab(MouseEvent.BUTTON1, SciTranslator.PRESSED, false)) { /* If LEFT BUTTON PRESSED */
this.freedom = false;
mouseX = arg0.getX();
mouseY = arg0.getY();
* @param lw the LinkWriter to use to handle links
*/
public static void setLinkWriter(LinkWriter lw) {
- handler.linkWriter = lw;
+ HTMLScilabCodeHandler.linkWriter = lw;
}
/**
public ScilabLexer(Set<String> primitives, Set<String> macros) {
commands = primitives;
- this.macros = macros;
+ ScilabLexer.macros = macros;
}
private void loadNames(String[] files, Set<String> set) {
if (datatip.getMarkMode()) {
/* TODO: appearance can be not-null */
Texture texture = markManager.getMarkSprite(datatip, colorMap, null);
- Vector3d markPos = datatipTextDrawer.calculateAnchorPoint(datatip);
+ Vector3d markPos = DatatipTextDrawer.calculateAnchorPoint(datatip);
drawingTools.draw(texture, AnchorPosition.CENTER, markPos);
}
if (datatip.getTipLabelMode()) {
pane.setCaretPosition(sep.getCaretPosition());
pane.getXln().setWhereamiLineNumbering(SciNotesOptions.getSciNotesDisplay().showLineNumbers, SciNotesOptions.getSciNotesDisplay().whereami);
ed.tabPane.setComponentAt(i, pane.getEditorComponent());
- ed.activateHelpOnTyping(pane);
+ SciNotes.activateHelpOnTyping(pane);
ed.initInputMap(pane);
if (((ScilabDocument) sep.getDocument()).getBinary()) {
pane.setBinary(true);
* Action
*/
public void doAction() {
- getEditor().cloneAndCloseCurrentTab(getEditor(), false);
+ SciNotes.cloneAndCloseCurrentTab(getEditor(), false);
}
}
gbc.gridx = gbc.gridy = 0;
gbc.gridwidth = gbc.gridheight = 1;
gbc.weightx = gbc.weighty = 0;
- gbc.anchor = gbc.LINE_START;
+ gbc.anchor = GridBagConstraints.LINE_START;
panelBase.add(baseDirLabel, gbc);
gbc.gridx = 0;
gbc.gridy = 1;
gbc.gridwidth = 1;
gbc.weightx = 0;
- gbc.fill = gbc.NONE;
+ gbc.fill = GridBagConstraints.NONE;
gbc.anchor = GridBagConstraints.BASELINE;
panelBase.add(chooseBaseDirButton, gbc);
gbc.gridx = 0;
gbc.gridy = 3;
- gbc.anchor = gbc.LINE_START;
+ gbc.anchor = GridBagConstraints.LINE_START;
panelBase.add(filePatternLabel, gbc);
gbc.gridy = 4;
gbc.gridy = 6;
gbc.gridwidth = 1;
gbc.weightx = 0;
- gbc.anchor = gbc.LINE_START;
+ gbc.anchor = GridBagConstraints.LINE_START;
panelBase.add(wordPatternLabel, gbc);
gbc.gridy = 7;
for (int i = 0; i < c; i++) {
buffer.position(r * i);
buffer.limit(r * i + r);
- if (!buffer.equals(buffer.wrap(data[i]))) {
+ if (!buffer.equals(DoubleBuffer.wrap(data[i]))) {
buffer.clear();
return false;
}
for (int i = 0; i < c; i++) {
buffer.position(r * i);
buffer.limit(r * i + r);
- if (!buffer.equals(buffer.wrap(data[i]))) {
+ if (!buffer.equals(ByteBuffer.wrap(data[i]))) {
buffer.clear();
return false;
}
for (int i = 0; i < c; i++) {
buffer.position(r * i);
buffer.limit(r * i + r);
- if (!buffer.equals(buffer.wrap(data[i]))) {
+ if (!buffer.equals(ShortBuffer.wrap(data[i]))) {
buffer.clear();
return false;
}
for (int i = 0; i < c; i++) {
buffer.position(r * i);
buffer.limit(r * i + r);
- if (!buffer.equals(buffer.wrap(data[i]))) {
+ if (!buffer.equals(IntBuffer.wrap(data[i]))) {
buffer.clear();
return false;
}
for (int i = 0; i < c; i++) {
buffer.position(r * i);
buffer.limit(r * i + r);
- if (!buffer.equals(buffer.wrap(data[i]))) {
+ if (!buffer.equals(LongBuffer.wrap(data[i]))) {
buffer.clear();
return false;
}
DeleteAction delete = new DeleteAction(SwingScilabVariableBrowser.this);
menu.add(delete.createMenuItem());
- ExportToCsvAction csvExport = new ExportToCsvAction((SwingScilabTab)SwingScilabVariableBrowser.this, UiDataMessages.EXPORTCSV);
- menu.add(csvExport.createMenuItem(SwingScilabVariableBrowser.this, UiDataMessages.EXPORTCSV));
+ menu.add(ExportToCsvAction.createMenuItem(SwingScilabVariableBrowser.this, UiDataMessages.EXPORTCSV));
Menu menuPlot = ScilabMenu.createMenu();
menuPlot.setText(UiDataMessages.PLOTALL);
Object[] values = askForNewMatrix();
if (!((String) values[0]).isEmpty()) {
SwingEditvarTableModel model = (SwingEditvarTableModel) table.getModel();
- String defaultValue = model.getDataAsScilabString(((String) values[3]));
+ String defaultValue = SwingEditvarTableModel.getDataAsScilabString(((String) values[3]));
if (defaultValue.isEmpty()) {
defaultValue = "0";
}