File list fixes

aat-android/src/main/kotlin/ch/bailu/aat/util/graphic/AndroidSyncTileBitmap.kt

@@ -31,15 +31,15 @@ class AndroidSyncTileBitmap : MapTileInterface {
  return bitmap
  }
 
- val androidBitmap: android.graphics.Bitmap?
+ private val androidBitmap: android.graphics.Bitmap?
  get() {
  val b = bitmap
  return if (b != null) {
  AndroidGraphicFactory.getBitmap(b)
  } else null
  }
 
- val androidCanvas: Canvas?
+ private val androidCanvas: Canvas?
  get() {
  val b = androidBitmap
  return if (b != null) {
@@ -56,7 +56,8 @@ class AndroidSyncTileBitmap : MapTileInterface {
 
  @Synchronized
  override fun set(file: Foc, defaultTileSize: Int, transparent: Boolean) {
- set(MapTileUtil.load(file, defaultTileSize, transparent))
+ free()
+ set(MapTileUtil.loadThrow(file, defaultTileSize, transparent))
  }
 
  @Throws(IOException::class)
@@ -93,6 +94,7 @@ class AndroidSyncTileBitmap : MapTileInterface {
 
  @Synchronized
  override fun set(defaultTileSize: Int, transparent: Boolean) {
+ free()
  set(AndroidGraphicFactory.INSTANCE.createTileBitmap(defaultTileSize, transparent))
  }
 
@@ -124,9 +126,7 @@ class AndroidSyncTileBitmap : MapTileInterface {
 
  @Synchronized
  override fun free() {
- if (bitmap != null) {
- bitmap!!.decrementRefCount()
- }
+ bitmap?.apply { decrementRefCount() }
  bitmap = null
  size = Obj.MIN_SIZE.toLong()
  }

aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/map/GtkSyncTileBitmap.kt

@@ -47,7 +47,8 @@ class GtkSyncTileBitmap : MapTileInterface {
 
  @Synchronized
  override fun set(file: Foc, defaultTileSize: Int, transparent: Boolean) {
- set(MapTileUtil.load(file, defaultTileSize, transparent))
+ free()
+ set(MapTileUtil.loadThrow(file, defaultTileSize, transparent))
  }
 
  @Synchronized

aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/view/list/FileList.kt

@@ -32,11 +32,11 @@ import ch.bailu.gtk.gtk.MenuButton
 import ch.bailu.gtk.gtk.Orientation
 import ch.bailu.gtk.gtk.PopoverMenu
 import ch.bailu.gtk.gtk.ScrolledWindow
-import ch.bailu.gtk.gtk.Separator
 import ch.bailu.gtk.gtk.SignalListItemFactory
 import ch.bailu.gtk.gtk.Spinner
 import ch.bailu.gtk.lib.bridge.ListIndex
 import ch.bailu.gtk.lib.util.SizeLog
+import ch.bailu.gtk.pango.EllipsizeMode
 import ch.bailu.gtk.type.Str
 
 class FileList(app: Application,
@@ -162,6 +162,7 @@ class FileList(app: Application,
 
  onTeardown {
  val item = ListItem(it.cast())
+ items[item]?.apply { teardown() }
  items.remove(item)
  logItems.log(items.size.toLong())
  }
@@ -198,8 +199,9 @@ class FileList(app: Application,
  append(menuButton)
  addCssClass(Strings.linked)
  })
- append(Separator(Orientation.VERTICAL))
- append(fileNameLabel)
+ append(fileNameLabel.apply {
+ ellipsize = EllipsizeMode.START
+ })
  })
 
  vbox.append(ScrolledWindow().apply {
@@ -220,7 +222,6 @@ class FileList(app: Application,
  }
  }
 
-
  private fun selectAndFrame(index: Int) {
  select(index)
  if (isIndexValid(indexOfSelected)) {
@@ -265,9 +266,11 @@ class FileList(app: Application,
  iteratorSimple.moveToPosition(indexOfSelected)
  overlayMenu.setFile(iteratorSimple.info.file)
  fileNameLabel.setLabel(iteratorSimple.info.file.name)
+ fileNameLabel.setTooltipText(iteratorSimple.info.file.toString())
  menuButton.sensitive = true
  } else {
  fileNameLabel.label = Str.NULL
+ fileNameLabel.tooltipText = Str.NULL
  menuButton.sensitive = false
  }
  }

aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/view/list/FileListItem.kt

@@ -62,7 +62,11 @@ class FileListItem(appContext: AppContext, listItem: ListItem, private val descr
  labels[1].setText(infoText)
  labels[2].setText(info.file.name)
 
- previewImageView.setFilePath(info.file) // TODO error message if file does not exists
- previewImageView.onAttached() // TODO memory management
+ previewImageView.setFilePath(info.file)
+ previewImageView.onAttached()
+ }
+
+ fun teardown() {
+ previewImageView.onDetached()
  }
 }

aat-lib/src/main/java/ch/bailu/aat_lib/map/tile/MapTileUtil.kt

@@ -1,22 +1,19 @@
 package ch.bailu.aat_lib.map.tile
 
 import ch.bailu.aat_lib.app.AppGraphicFactory
-import ch.bailu.aat_lib.logger.AppLog
 import ch.bailu.foc.Foc
 import org.mapsforge.core.graphics.TileBitmap
+import java.io.IOException
 
 object MapTileUtil {
- fun load(file: Foc, size: Int, transparent: Boolean): TileBitmap? {
- var result: TileBitmap? = null
-
- try {
- file.openR()?.use {
- result = AppGraphicFactory.instance().createTileBitmap(it, size, transparent)
- result?.timestamp = file.lastModified()
+ fun loadThrow(file: Foc, size: Int, transparent: Boolean): TileBitmap {
+ file.openR()?.use {
+ val result = AppGraphicFactory.instance().createTileBitmap(it, size, transparent)
+ if (result is TileBitmap) {
+ result.timestamp = file.lastModified()
+ return result
  }
- } catch (e: Exception) {
- AppLog.e(this, e)
  }
- return result
+ throw IOException(file.toString())
  }
 }

aat-lib/src/main/java/ch/bailu/aat_lib/service/cache/ObjTileCacheOnly.kt

@@ -2,6 +2,7 @@ package ch.bailu.aat_lib.service.cache
 
 import ch.bailu.aat_lib.app.AppContext
 import ch.bailu.aat_lib.dispatcher.AppBroadcaster
+import ch.bailu.aat_lib.logger.AppLog
 import ch.bailu.aat_lib.map.tile.MapTileInterface
 import ch.bailu.aat_lib.map.tile.source.Source
 import ch.bailu.aat_lib.preferences.map.SolidTileSize
@@ -89,7 +90,16 @@ open class ObjTileCacheOnly(id: String, sc: AppContext, private val tile: Tile,
  object : OnObject(appContext, file.toString(), ObjTileCacheOnly::class.java) {
  override fun run(handle: Obj) {
  val tile = handle as ObjTileCacheOnly
- tile.bitmap.set(file, SolidTileSize.DEFAULT_TILESIZE, tile.source.isTransparent)
+ try {
+ tile.bitmap.set(
+ file,
+ SolidTileSize.DEFAULT_TILESIZE,
+ tile.source.isTransparent
+ )
+ } catch (e : Exception) {
+ AppLog.e(this, e)
+ }
+
  appContext.broadcaster.broadcast(
  AppBroadcaster.FILE_CHANGED_INCACHE,
  file.toString()