Skip to content

Commit d55ae6e

Browse files
author
Andrea Medeghini
committed
rename classes
1 parent 4c7546e commit d55ae6e

File tree

19 files changed

+102
-101
lines changed

19 files changed

+102
-101
lines changed

‎com.nextbreakpoint.nextfractal.contextfree.javafx/src/main/java/com/nextbreakpoint/nextfractal/contextfree/javafx/ContextFreeUIFactory.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
import com.nextbreakpoint.nextfractal.core.graphics.GraphicsUtils;
4444
import com.nextbreakpoint.nextfractal.core.graphics.Size;
4545
import com.nextbreakpoint.nextfractal.core.graphics.Tile;
46-
import com.nextbreakpoint.nextfractal.core.javafx.Bitmap;
47-
import com.nextbreakpoint.nextfractal.core.javafx.SimpleBitmap;
46+
import com.nextbreakpoint.nextfractal.core.javafx.RenderedImage;
47+
import com.nextbreakpoint.nextfractal.core.javafx.SimpleImage;
4848
import com.nextbreakpoint.nextfractal.core.javafx.EventBusPublisher;
49-
import com.nextbreakpoint.nextfractal.core.javafx.grid.GridItemRenderer;
49+
import com.nextbreakpoint.nextfractal.core.javafx.ImageRenderer;
5050
import com.nextbreakpoint.nextfractal.core.javafx.KeyHandler;
5151
import com.nextbreakpoint.nextfractal.core.javafx.MetadataDelegate;
5252
import com.nextbreakpoint.nextfractal.core.javafx.RenderingContext;
@@ -71,7 +71,7 @@ public String getId() {
7171
}
7272

7373
@Override
74-
public GridItemRenderer createRenderer(Bitmap bitmap) {
74+
public ImageRenderer createRenderer(RenderedImage bitmap) {
7575
final Map<String, Integer> hints = new HashMap<>();
7676
final Tile tile = GraphicsUtils.createTile(bitmap.getWidth(), bitmap.getHeight());
7777
final ThreadFactory threadFactory = ThreadUtils.createPlatformThreadFactory("ContextFree Browser");
@@ -86,10 +86,10 @@ public GridItemRenderer createRenderer(Bitmap bitmap) {
8686
}
8787

8888
@Override
89-
public Bitmap createBitmap(Session session, Size size) throws Exception {
89+
public RenderedImage createBitmap(Session session, Size size) throws Exception {
9090
final CFParser compiler = new CFParser();
9191
final CFParserResult report = compiler.parse(session.script());
92-
final Bitmap bitmap = new SimpleBitmap(size.width(), size.height(), null);
92+
final RenderedImage bitmap = new SimpleImage(size.width(), size.height(), null);
9393
bitmap.setProperty("image", report.classFactory().create());
9494
bitmap.setProperty("session", session);
9595
return bitmap;
@@ -147,7 +147,7 @@ public ToolContext<? extends Metadata> createToolContext(RenderingContext render
147147
return new ContextFreeToolContext(renderingContext, (ContextFreeRenderingStrategy) renderingStrategy, delegate, width, height);
148148
}
149149

150-
private static class GridItemRendererAdapter implements GridItemRenderer {
150+
private static class GridItemRendererAdapter implements ImageRenderer {
151151
private final Coordinator coordinator;
152152

153153
public GridItemRendererAdapter(Coordinator coordinator) {

‎com.nextbreakpoint.nextfractal.core.javafx/src/main/java/com/nextbreakpoint/nextfractal/core/javafx/grid/GridItemRenderer.java renamed to ‎com.nextbreakpoint.nextfractal.core.javafx/src/main/java/com/nextbreakpoint/nextfractal/core/javafx/ImageRenderer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
* along with NextFractal. If not, see <http://www.gnu.org/licenses/>.
2323
*
2424
*/
25-
package com.nextbreakpoint.nextfractal.core.javafx.grid;
25+
package com.nextbreakpoint.nextfractal.core.javafx;
2626

2727
import com.nextbreakpoint.nextfractal.core.graphics.GraphicsContext;
2828

29-
public interface GridItemRenderer {
29+
public interface ImageRenderer {
3030
void abort();
3131

3232
void waitFor() throws InterruptedException;

‎com.nextbreakpoint.nextfractal.core.javafx/src/main/java/com/nextbreakpoint/nextfractal/core/javafx/Bitmap.java renamed to ‎com.nextbreakpoint.nextfractal.core.javafx/src/main/java/com/nextbreakpoint/nextfractal/core/javafx/RenderedImage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import java.util.Date;
2929
import java.util.UUID;
3030

31-
public interface Bitmap {
31+
public interface RenderedImage {
3232
IntBuffer getPixels();
3333

3434
int getWidth();

‎com.nextbreakpoint.nextfractal.core.javafx/src/main/java/com/nextbreakpoint/nextfractal/core/javafx/SimpleBitmap.java renamed to ‎com.nextbreakpoint.nextfractal.core.javafx/src/main/java/com/nextbreakpoint/nextfractal/core/javafx/SimpleImage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import java.util.Map;
3434
import java.util.UUID;
3535

36-
public class SimpleBitmap implements Bitmap {
36+
public class SimpleImage implements RenderedImage {
3737
private final Map<String, Object> properties = new HashMap<>();
3838
private final UUID uuid;
3939
@Getter
@@ -48,7 +48,7 @@ public class SimpleBitmap implements Bitmap {
4848
@Getter
4949
private double progress;
5050

51-
public SimpleBitmap(int width, int height, IntBuffer pixels) {
51+
public SimpleImage(int width, int height, IntBuffer pixels) {
5252
this.pixels = pixels;
5353
this.width = width;
5454
this.height = height;

‎com.nextbreakpoint.nextfractal.core.javafx/src/main/java/com/nextbreakpoint/nextfractal/core/javafx/UIFactory.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import com.nextbreakpoint.nextfractal.core.common.ParserStrategy;
3131
import com.nextbreakpoint.nextfractal.core.common.Session;
3232
import com.nextbreakpoint.nextfractal.core.graphics.Size;
33-
import com.nextbreakpoint.nextfractal.core.javafx.grid.GridItemRenderer;
3433
import com.nextbreakpoint.nextfractal.core.javafx.viewer.Toolbar;
3534
import javafx.scene.layout.Pane;
3635

@@ -39,9 +38,9 @@
3938
public interface UIFactory {
4039
String getId();
4140

42-
GridItemRenderer createRenderer(Bitmap bitmap) throws Exception;
41+
ImageRenderer createRenderer(RenderedImage bitmap) throws Exception;
4342

44-
Bitmap createBitmap(Session session, Size size) throws Exception;
43+
RenderedImage createBitmap(Session session, Size size) throws Exception;
4544

4645
Either<String> loadResource(String resourceName);
4746

‎com.nextbreakpoint.nextfractal.core.javafx/src/main/java/com/nextbreakpoint/nextfractal/core/javafx/browse/BrowseDelegate.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
package com.nextbreakpoint.nextfractal.core.javafx.browse;
2626

2727
import com.nextbreakpoint.nextfractal.core.graphics.Size;
28-
import com.nextbreakpoint.nextfractal.core.javafx.Bitmap;
29-
import com.nextbreakpoint.nextfractal.core.javafx.grid.GridItemRenderer;
28+
import com.nextbreakpoint.nextfractal.core.javafx.RenderedImage;
29+
import com.nextbreakpoint.nextfractal.core.javafx.ImageRenderer;
3030

3131
import java.io.File;
3232
import java.util.List;
@@ -38,7 +38,7 @@ public interface BrowseDelegate {
3838

3939
void didClose(BrowsePane source);
4040

41-
GridItemRenderer createRenderer(Bitmap bitmap) throws Exception;
41+
ImageRenderer createRenderer(RenderedImage bitmap) throws Exception;
4242

43-
Bitmap createBitmap(File file, Size size) throws Exception;
43+
RenderedImage createBitmap(File file, Size size) throws Exception;
4444
}

‎com.nextbreakpoint.nextfractal.core.javafx/src/main/java/com/nextbreakpoint/nextfractal/core/javafx/browse/BrowseListCell.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
import com.nextbreakpoint.nextfractal.core.graphics.Size;
2828
import com.nextbreakpoint.nextfractal.core.graphics.Tile;
29-
import com.nextbreakpoint.nextfractal.core.javafx.Bitmap;
29+
import com.nextbreakpoint.nextfractal.core.javafx.RenderedImage;
3030
import javafx.scene.canvas.Canvas;
3131
import javafx.scene.canvas.GraphicsContext;
3232
import javafx.scene.control.ListCell;
@@ -35,7 +35,7 @@
3535
import javafx.scene.layout.HBox;
3636
import javafx.scene.transform.Affine;
3737

38-
public class BrowseListCell extends ListCell<Bitmap[]> {
38+
public class BrowseListCell extends ListCell<RenderedImage[]> {
3939
private final HBox pane;
4040
private final Canvas[] canvas;
4141
private final Size size;
@@ -55,13 +55,13 @@ public BrowseListCell(int numOfColumns, Size size, Tile tile) {
5555
}
5656

5757
@Override
58-
public void updateItem(Bitmap[] bitmaps, boolean empty) {
58+
public void updateItem(RenderedImage[] bitmaps, boolean empty) {
5959
super.updateItem(bitmaps, empty);
6060
if (empty) {
6161
setGraphic(null);
6262
} else {
6363
for (int i = 0 ; i < numOfColumns; i++) {
64-
Bitmap bitmap = bitmaps[i];
64+
RenderedImage bitmap = bitmaps[i];
6565
if (bitmap != null && bitmap.getPixels() != null) {
6666
renderFractal(canvas[i].getGraphicsContext2D(), bitmap);
6767
}
@@ -70,7 +70,7 @@ public void updateItem(Bitmap[] bitmaps, boolean empty) {
7070
}
7171
}
7272

73-
private void renderFractal(GraphicsContext g2d, Bitmap bitmap) {
73+
private void renderFractal(GraphicsContext g2d, RenderedImage bitmap) {
7474
WritableImage image = new WritableImage(size.width(), size.height());
7575
image.getPixelWriter().setPixels(0, 0, (int)image.getWidth(), (int)image.getHeight(), PixelFormat.getIntArgbInstance(), bitmap.getPixels(), (int)image.getWidth());
7676
Affine affine = new Affine();

‎com.nextbreakpoint.nextfractal.core.javafx/src/main/java/com/nextbreakpoint/nextfractal/core/javafx/browse/BrowsePane.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
import com.nextbreakpoint.nextfractal.core.graphics.Point;
3434
import com.nextbreakpoint.nextfractal.core.graphics.Size;
3535
import com.nextbreakpoint.nextfractal.core.graphics.Tile;
36-
import com.nextbreakpoint.nextfractal.core.javafx.Bitmap;
36+
import com.nextbreakpoint.nextfractal.core.javafx.RenderedImage;
3737
import com.nextbreakpoint.nextfractal.core.javafx.grid.GridItem;
38-
import com.nextbreakpoint.nextfractal.core.javafx.grid.GridItemRenderer;
38+
import com.nextbreakpoint.nextfractal.core.javafx.ImageRenderer;
3939
import com.nextbreakpoint.nextfractal.core.javafx.grid.GridView;
4040
import com.nextbreakpoint.nextfractal.core.javafx.grid.GridViewDelegate;
4141
import com.nextbreakpoint.nextfractal.core.javafx.Icons;
@@ -569,7 +569,7 @@ private void updateCells(GridView grid) throws ExecutionException, InterruptedEx
569569
for (int index = 0; index < firstIndex; index++) {
570570
final GridItem item = items.get(index);
571571
if (item.getRenderer() != null) {
572-
final GridItemRenderer renderer = item.getRenderer();
572+
final ImageRenderer renderer = item.getRenderer();
573573
item.setRenderer(null);
574574
item.setBitmap(null);
575575
renderer.dispose();
@@ -578,16 +578,16 @@ private void updateCells(GridView grid) throws ExecutionException, InterruptedEx
578578
for (int index = lastIndex; index < items.size(); index++) {
579579
final GridItem item = items.get(index);
580580
if (item.getRenderer() != null) {
581-
final GridItemRenderer renderer = item.getRenderer();
581+
final ImageRenderer renderer = item.getRenderer();
582582
item.setRenderer(null);
583583
item.setBitmap(null);
584584
renderer.dispose();
585585
}
586586
}
587587
for (int index = firstIndex; index < Math.min(lastIndex, items.size()); index++) {
588588
final GridItem item = items.get(index);
589-
final Bitmap bitmap = item.getBitmap();
590-
final GridItemRenderer renderer = item.getRenderer();
589+
final RenderedImage bitmap = item.getBitmap();
590+
final ImageRenderer renderer = item.getRenderer();
591591
final long time = System.currentTimeMillis();
592592
if (bitmap == null && time - item.getLastChanged() > SCROLL_BOUNCE_DELAY && item.getLoadItemFuture() == null) {
593593
loadItemAsync(item);
@@ -610,7 +610,7 @@ private void loadItemAsync(GridItem item) {
610610
private void loadItem(GridItem item, File file) {
611611
try {
612612
if (!item.isAborted() && delegate != null) {
613-
final Bitmap bitmap = delegate.createBitmap(file, tile.tileSize());
613+
final RenderedImage bitmap = delegate.createBitmap(file, tile.tileSize());
614614
Platform.runLater(() -> item.setBitmap(bitmap));
615615
}
616616
} catch (Exception e) {
@@ -620,17 +620,17 @@ private void loadItem(GridItem item, File file) {
620620
}
621621

622622
private void initItemAsync(GridItem item) {
623-
final Bitmap bitmap = item.getBitmap();
623+
final RenderedImage bitmap = item.getBitmap();
624624
item.setInitItemFuture(executor.submit(() -> {
625625
initItem(item, bitmap);
626626
return null;
627627
}));
628628
}
629629

630-
private void initItem(GridItem item, Bitmap bitmap) {
630+
private void initItem(GridItem item, RenderedImage bitmap) {
631631
try {
632632
if (!item.isAborted() && delegate != null) {
633-
final GridItemRenderer renderer = delegate.createRenderer(bitmap);
633+
final ImageRenderer renderer = delegate.createRenderer(bitmap);
634634
Platform.runLater(() -> item.setRenderer(renderer));
635635
}
636636
} catch (Exception e) {

‎com.nextbreakpoint.nextfractal.core.javafx/src/main/java/com/nextbreakpoint/nextfractal/core/javafx/export/ClipListCell.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
import com.nextbreakpoint.nextfractal.core.common.AnimationClip;
2828
import com.nextbreakpoint.nextfractal.core.graphics.Tile;
29-
import com.nextbreakpoint.nextfractal.core.javafx.Bitmap;
29+
import com.nextbreakpoint.nextfractal.core.javafx.RenderedImage;
3030
import javafx.geometry.Pos;
3131
import javafx.scene.canvas.Canvas;
3232
import javafx.scene.canvas.GraphicsContext;
@@ -49,7 +49,7 @@
4949
import java.util.Map;
5050
import java.util.stream.Collectors;
5151

52-
public class ClipListCell extends ListCell<Bitmap> {
52+
public class ClipListCell extends ListCell<RenderedImage> {
5353
private final BorderPane pane;
5454
private final Canvas canvas;
5555
private final Label label;
@@ -117,13 +117,13 @@ public ClipListCell(Tile tile) {
117117
boolean success = false;
118118

119119
if (db.hasString()) {
120-
final Map<String, Bitmap> itemsMap = getListView().getItems().stream().collect(Collectors.toMap(bitmap -> bitmap.getId().toString(), bitmap -> bitmap));
120+
final Map<String, RenderedImage> itemsMap = getListView().getItems().stream().collect(Collectors.toMap(bitmap -> bitmap.getId().toString(), bitmap -> bitmap));
121121
final List<String> itemsIds = getListView().getItems().stream().map(bitmap -> bitmap.getId().toString()).collect(Collectors.toList());
122122
final int draggedIdx = itemsIds.indexOf(db.getString());
123123
final int thisIdx = itemsIds.indexOf(getItem().getId().toString());
124124
itemsIds.remove(draggedIdx);
125125
itemsIds.add(thisIdx, db.getString());
126-
final List<Bitmap> newItems = new ArrayList();
126+
final List<RenderedImage> newItems = new ArrayList();
127127
itemsIds.forEach(itemId -> newItems.add(itemsMap.get(itemId)));
128128
getListView().getItems().setAll(newItems);
129129
success = true;
@@ -141,7 +141,7 @@ public ClipListCell(Tile tile) {
141141
}
142142

143143
@Override
144-
public void updateItem(Bitmap bitmap, boolean empty) {
144+
public void updateItem(RenderedImage bitmap, boolean empty) {
145145
super.updateItem(bitmap, empty);
146146
if (empty) {
147147
setGraphic(null);
@@ -170,7 +170,7 @@ public void updateItem(Bitmap bitmap, boolean empty) {
170170
}
171171
}
172172

173-
private WritableImage getWritableImage(Bitmap bitmap) {
173+
private WritableImage getWritableImage(RenderedImage bitmap) {
174174
final WritableImage image = new WritableImage(bitmap.getWidth(), bitmap.getHeight());
175175
image.getPixelWriter().setPixels(0, 0, (int)image.getWidth(), (int)image.getHeight(), PixelFormat.getIntArgbInstance(), bitmap.getPixels(), (int)image.getWidth());
176176
return image;

‎com.nextbreakpoint.nextfractal.core.javafx/src/main/java/com/nextbreakpoint/nextfractal/core/javafx/export/ExportPane.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
import com.nextbreakpoint.nextfractal.core.graphics.Size;
3535
import com.nextbreakpoint.nextfractal.core.graphics.Tile;
3636
import com.nextbreakpoint.nextfractal.core.javafx.misc.AdvancedTextField;
37-
import com.nextbreakpoint.nextfractal.core.javafx.Bitmap;
38-
import com.nextbreakpoint.nextfractal.core.javafx.SimpleBitmap;
37+
import com.nextbreakpoint.nextfractal.core.javafx.RenderedImage;
38+
import com.nextbreakpoint.nextfractal.core.javafx.SimpleImage;
3939
import com.nextbreakpoint.nextfractal.core.javafx.observable.BooleanObservableValue;
4040
import javafx.application.Platform;
4141
import javafx.collections.ListChangeListener;
@@ -68,7 +68,7 @@ public class ExportPane extends BorderPane {
6868

6969
private final Tile tile;
7070
private final ExecutorService executor;
71-
private final ListView<Bitmap> listView;
71+
private final ListView<RenderedImage> listView;
7272
private final BooleanObservableValue captureProperty;
7373
private final BooleanObservableValue videoProperty;
7474
private final ToggleButton captureButton;
@@ -164,7 +164,7 @@ public ExportPane(Tile tile) {
164164
listView.setTooltip(new Tooltip("List of captured clips"));
165165
listView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
166166

167-
listView.getSelectionModel().getSelectedItems().addListener((ListChangeListener.Change<? extends Bitmap> c) -> itemSelected(listView));
167+
listView.getSelectionModel().getSelectedItems().addListener((ListChangeListener.Change<? extends RenderedImage> c) -> itemSelected(listView));
168168

169169
final VBox exportPane = new VBox(8);
170170
exportPane.setAlignment(Pos.TOP_CENTER);
@@ -430,11 +430,11 @@ private void loadVideoPresets(ComboBox<Integer[]> presetsCombobox) {
430430
presetsCombobox.getSelectionModel().select(1);
431431
}
432432

433-
private void itemSelected(ListView<Bitmap> listView) {
433+
private void itemSelected(ListView<RenderedImage> listView) {
434434
}
435435

436-
private void addItem(ListView<Bitmap> listView, AnimationClip clip, IntBuffer pixels, Size size, boolean notifyAddClip) {
437-
final Bitmap bitmap = new SimpleBitmap(size.width(), size.height(), pixels);
436+
private void addItem(ListView<RenderedImage> listView, AnimationClip clip, IntBuffer pixels, Size size, boolean notifyAddClip) {
437+
final RenderedImage bitmap = new SimpleImage(size.width(), size.height(), pixels);
438438
bitmap.setProperty("clip", clip);
439439
listView.getItems().add(bitmap);
440440
if (listView.getItems().size() == 1) {
@@ -449,8 +449,8 @@ private void addItem(ListView<Bitmap> listView, AnimationClip clip, IntBuffer pi
449449
}
450450
}
451451

452-
private void removeItem(ListView<Bitmap> listView, int index) {
453-
final Bitmap bitmap = listView.getItems().remove(index);
452+
private void removeItem(ListView<RenderedImage> listView, int index) {
453+
final RenderedImage bitmap = listView.getItems().remove(index);
454454
if (bitmap == null) {
455455
return;
456456
}

0 commit comments

Comments
 (0)